Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 62755: [RSHELL] * Fix gcc build. * Wip beginning of horizontal menubar keyboard navigation. Not working yet. ; P CORE-7586
by dquintana＠svn.reactos.org 15 Apr '14

15 Apr '14

Author: dquintana Date: Tue Apr 15 22:30:37 2014 New Revision: 62755 URL: http://svn.reactos.org/svn/reactos?rev=62755&view=rev Log: [RSHELL] * Fix gcc build. * Wip beginning of horizontal menubar keyboard navigation. Not working yet. ;P CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Tue Apr 15 22:30:37 2014 @@ -157,6 +157,9 @@ m_captureHwnd(0), m_hwndUnderMouse(NULL), m_entryUnderMouse(NULL), + m_selectedMenu(NULL), + m_selectedItem(0), + m_selectedItemFlags(0), m_bandCount(0) { m_ptPrev.x = 0; @@ -354,6 +357,35 @@ break; case WM_MOUSEMOVE: callNext = ProcessMouseMove(msg); + break; + case WM_INITMENUPOPUP: + DbgPrint("WM_INITMENUPOPUP %p %p\n", wParam, lParam); + m_selectedMenu = reinterpret_cast<HMENU>(lParam); + m_selectedItem = -1; + m_selectedItemFlags = 0; + break; + case WM_MENUSELECT: + DbgPrint("WM_MENUSELECT %p %p\n", wParam, lParam); + m_selectedMenu = reinterpret_cast<HMENU>(lParam); + m_selectedItem = LOWORD(wParam); + m_selectedItemFlags = HIWORD(wParam); + break; + case WM_KEYDOWN: + switch (msg->wParam) + { + case VK_LEFT: + if (m_current->hmenu == m_selectedMenu) + { + m_parent->mb->_MenuItemHotTrack(VK_LEFT); + } + break; + case VK_RIGHT: + if (!(m_selectedItemFlags & MF_POPUP)) + { + m_parent->mb->_MenuItemHotTrack(VK_RIGHT); + } + break; + } break; } Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] Tue Apr 15 22:30:37 2014 @@ -73,6 +73,10 @@ HWND m_hwndUnderMouse; StackEntry * m_entryUnderMouse; + HMENU m_selectedMenu; + INT m_selectedItem; + DWORD m_selectedItemFlags; + // TODO: make dynamic #define MAX_RECURSE 20 StackEntry m_bandStack[MAX_RECURSE]; Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Tue Apr 15 22:30:37 2014 @@ -277,12 +277,12 @@ CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) : m_hwnd(NULL), + m_hwndToolbar(NULL), m_useFlatMenus(FALSE), m_SubclassOld(NULL), m_disableMouseTrack(FALSE), m_timerEnabled(FALSE), m_menuBand(menuBand), - m_hwndToolbar(NULL), m_dwMenuFlags(0), m_hasSizes(FALSE), m_usePager(usePager),

1 0

[tfaber] 62754: [CPL] - Hide "Open as read-only" checkbox in dialogs where the file is always used read-only. Patch by Ricardo Hanke. CORE-7760 #resolve
by tfaber＠svn.reactos.org 15 Apr '14

15 Apr '14

Author: tfaber Date: Tue Apr 15 18:03:29 2014 New Revision: 62754 URL: http://svn.reactos.org/svn/reactos?rev=62754&view=rev Log: [CPL] - Hide "Open as read-only" checkbox in dialogs where the file is always used read-only. Patch by Ricardo Hanke. CORE-7760 #resolve Modified: trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Tue Apr 15 18:03:29 2014 @@ -493,7 +493,7 @@ ofn.lpstrFileTitle = fileTitle; ofn.nMaxFileTitle = 256; ofn.lpstrInitialDir = NULL; - ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; + ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; if (GetOpenFileName(&ofn) == TRUE) { Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=6… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Tue Apr 15 18:03:29 2014 @@ -852,7 +852,7 @@ ofn.nMaxFile = MAX_PATH; ofn.lpstrInitialDir = _T("%WINDIR%\\Cursors"); ofn.lpstrTitle = szTitle; - ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST; + ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; if (!GetOpenFileName(&ofn)) return FALSE; Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Tue Apr 15 18:03:29 2014 @@ -957,7 +957,7 @@ ofn.lpstrFileTitle = L"Search for new sounds"; //FIXME non-nls ofn.nMaxFileTitle = wcslen(ofn.lpstrFileTitle); ofn.lpstrInitialDir = NULL; - ofn.Flags = OFN_FILEMUSTEXIST; + ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; if (GetOpenFileNameW(&ofn) == TRUE) {

1 0

[dquintana] 62753: [RSHELL] * Fix keyboard navigation on vertical popup menus. Navigating through the menubar does not work yet. CORE-7586
by dquintana＠svn.reactos.org 15 Apr '14

15 Apr '14

Author: dquintana Date: Tue Apr 15 15:53:17 2014 New Revision: 62753 URL: http://svn.reactos.org/svn/reactos?rev=62753&view=rev Log: [RSHELL] * Fix keyboard navigation on vertical popup menus. Navigating through the menubar does not work yet. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Tue Apr 15 15:53:17 2014 @@ -809,16 +809,16 @@ return hr; // Select the second toolbar based on the first - if (tb == m_SFToolbar) + if (tb == m_SFToolbar && m_staticToolbar) tb = m_staticToolbar; - else + else if (m_SFToolbar) tb = m_SFToolbar; if (!tb) return hr; // Ask the second toolbar to change - return tb->KeyboardItemChange(change == VK_DOWN ? VK_END : VK_HOME); + return tb->KeyboardItemChange(change == VK_DOWN ? VK_HOME : VK_END); } HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType) Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Tue Apr 15 15:53:17 2014 @@ -913,7 +913,7 @@ if (prev != btn.idCommand) { TRACE("Setting Hot item to %d\n", index); - m_menuBand->_ChangeHotItem(this, index, 0); + m_menuBand->_ChangeHotItem(this, btn.idCommand, 0); } return S_OK; } @@ -927,6 +927,8 @@ index++; } } + + return S_FALSE; } if (prev != -1)

1 0

[dquintana] 62752: [RSHELL] * Fixed the context menu for shell items. * Some more code style improvements. * Moved the toggles between using system classes and rshell classes into the constructor f...
by dquintana＠svn.reactos.org 15 Apr '14

15 Apr '14

Author: dquintana Date: Tue Apr 15 10:08:08 2014 New Revision: 62752 URL: http://svn.reactos.org/svn/reactos?rev=62752&view=rev Log: [RSHELL] * Fixed the context menu for shell items. * Some more code style improvements. * Moved the toggles between using system classes and rshell classes into the constructor functions, so the code is easier to read. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h branches/shell-experiments/base/shell/rshell/CStartMenu.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Tue Apr 15 10:08:08 2014 @@ -35,6 +35,12 @@ extern "C" HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv) { +#if USE_SYSTEM_MENUBAND + hr = CoCreateInstance(CLSID_MenuBand, + NULL, + CLSCTX_INPROC_SERVER, + riid, ppv); +#else *ppv = NULL; CMenuBand * site = new CComObject<CMenuBand>(); @@ -48,6 +54,7 @@ site->Release(); return hr; +#endif } CMenuBand::CMenuBand() : @@ -687,18 +694,11 @@ HRESULT CMenuBand::_TrackSubMenu(HMENU popup, INT x, INT y, RECT& rcExclude) { TPMPARAMS params = { sizeof(TPMPARAMS), rcExclude }; - - UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN; + UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN; + HWND hwnd = m_menuOwner ? m_menuOwner : m_topLevelWindow; m_focusManager->PushTrackedPopup(popup); - if (m_menuOwner) - { - ::TrackPopupMenuEx(popup, flags, x, y, m_menuOwner, &params); - } - else - { - ::TrackPopupMenuEx(popup, flags, x, y, m_topLevelWindow, &params); - } + ::TrackPopupMenuEx(popup, flags, x, y, hwnd, &params); m_focusManager->PopTrackedPopup(popup); _DisableMouseTrack(FALSE); @@ -715,27 +715,34 @@ if (popup == NULL) return E_FAIL; + DbgPrint("Before Query\n"); hr = contextMenu->QueryContextMenu(popup, 0, 0, UINT_MAX, CMF_NORMAL); if (FAILED_UNEXPECTEDLY(hr)) { + DbgPrint("Query failed\n"); DestroyMenu(popup); return hr; } HWND hwnd = m_menuOwner ? m_menuOwner : m_topLevelWindow; - m_focusManager->PushTrackedPopup(popup); - uCommand = ::TrackPopupMenuEx(popup, TPM_RETURNCMD, x, y, m_menuOwner, NULL); - m_focusManager->PopTrackedPopup(popup); - - if (uCommand == 0) - return S_FALSE; - - CMINVOKECOMMANDINFO cmi = { 0 }; - cmi.cbSize = sizeof(cmi); - cmi.lpVerb = MAKEINTRESOURCEA(uCommand); - cmi.hwnd = hwnd; - hr = contextMenu->InvokeCommand(&cmi); + DbgPrint("Before Tracking\n"); + uCommand = ::TrackPopupMenuEx(popup, TPM_RETURNCMD, x, y, hwnd, NULL); + + if (uCommand != 0) + { + DbgPrint("Before InvokeCommand\n"); + CMINVOKECOMMANDINFO cmi = { 0 }; + cmi.cbSize = sizeof(cmi); + cmi.lpVerb = MAKEINTRESOURCEA(uCommand); + cmi.hwnd = hwnd; + hr = contextMenu->InvokeCommand(&cmi); + } + else + { + DbgPrint("TrackPopupMenu failed. Code=%d, LastError=%d\n", uCommand, GetLastError()); + hr = S_FALSE; + } DestroyMenu(popup); return hr; @@ -787,7 +794,7 @@ if (!tb) { // If no hot item was selected - // choose the first toolbar (prefer shell-folder, which will be positionedat the top) + // choose the first toolbar (prefer shell-folder, which will be positioned at the top) if (m_SFToolbar) tb = m_SFToolbar; @@ -895,26 +902,11 @@ IDeskBar* pDeskBar; // Create the necessary objects - -#if USE_SYSTEM_MENUSITE - hr = CoCreateInstance(CLSID_MenuBandSite, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IBandSite, &pBandSite)); -#else hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite)); -#endif - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - -#if USE_SYSTEM_MENUDESKBAR - hr = CoCreateInstance(CLSID_MenuDeskBar, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IDeskBar, &pDeskBar)); -#else + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); -#endif if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Tue Apr 15 10:08:08 2014 @@ -30,6 +30,12 @@ extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv) { +#if USE_SYSTEM_MENUDESKBAR + hr = CoCreateInstance(CLSID_MenuDeskBar, + NULL, + CLSCTX_INPROC_SERVER, + riid, ppv); +#else *ppv = NULL; CMenuDeskBar * deskbar = new CComObject<CMenuDeskBar>(); @@ -43,6 +49,7 @@ deskbar->Release(); return hr; +#endif } CMenuDeskBar::CMenuDeskBar() : Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Tue Apr 15 10:08:08 2014 @@ -28,6 +28,12 @@ extern "C" HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv) { +#if USE_SYSTEM_MENUSITE + hr = CoCreateInstance(CLSID_MenuBandSite, + NULL, + CLSCTX_INPROC_SERVER, + riid, ppv); +#else *ppv = NULL; CMenuSite * site = new CComObject<CMenuSite>(); @@ -41,6 +47,7 @@ site->Release(); return hr; +#endif } CMenuSite::CMenuSite() : Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Tue Apr 15 10:08:08 2014 @@ -539,7 +539,7 @@ GetDataFromId(iItem, &index, &dwData); - return GetInfoTip(tip->pszText, tip->cchTextMax, iItem, index, dwData); + return InternalGetTooltip(iItem, index, dwData, tip->pszText, tip->cchTextMax); } HRESULT CMenuToolbarBase::OnPopupTimer(DWORD timerId) @@ -784,13 +784,14 @@ return S_OK; } -HRESULT CMenuToolbarBase::DoContextMenu(IContextMenu* contextMenu) -{ - // Calculate the context menu position - DWORD dwPos = GetMessagePos(); - POINT pt = { GET_X_LPARAM(dwPos), GET_Y_LPARAM(dwPos) }; - - // Display the submenu +HRESULT CMenuToolbarBase::TrackContextMenu(IContextMenu* contextMenu, POINT pt) +{ + // Cancel submenus + m_menuBand->_KillPopupTimers(); + if (m_popupBar) + m_menuBand->_CancelCurrentPopup(); + + // Display the context menu return m_menuBand->_TrackContextMenu(contextMenu, pt.x, pt.y); } @@ -827,7 +828,24 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - return OnCommandInternal(wParam, lParam, theResult); + INT iItem = wParam; + INT index; + DWORD_PTR data; + + GetDataFromId(iItem, &index, &data); + + return InternalExecuteItem(iItem, index, data); +} + +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) @@ -838,14 +856,6 @@ if (dwSelectType != 0xFFFFFFFF) { int count = SendMessage(m_hwndToolbar, TB_BUTTONCOUNT, 0, 0); - - if (m_hotItem >= 0) - { - TBBUTTONINFO info = { 0 }; - info.cbSize = sizeof(TBBUTTONINFO); - info.dwMask = 0; - index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, m_hotItem, reinterpret_cast<LPARAM>(&info)); - } if (dwSelectType == VK_HOME) { @@ -857,19 +867,57 @@ index = count - 1; dwSelectType = VK_UP; } - else if (index < 0) + else { - if (dwSelectType == VK_UP) + if (m_hotItem >= 0) { - index = count - 1; + TBBUTTONINFO info = { 0 }; + info.cbSize = sizeof(TBBUTTONINFO); + info.dwMask = 0; + index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, m_hotItem, reinterpret_cast<LPARAM>(&info)); } - else if (dwSelectType == VK_DOWN) + + if (index < 0) { - index = 0; + if (dwSelectType == VK_UP) + { + index = count - 1; + } + else if (dwSelectType == VK_DOWN) + { + index = 0; + } + } + else + { + if (dwSelectType == VK_UP) + { + index--; + } + else if (dwSelectType == VK_DOWN) + { + index++; + } } } - else + + TBBUTTON btn = { 0 }; + while (index >= 0 && index < count) { + DWORD res = SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); + if (!res) + return E_FAIL; + + if (btn.dwData) + { + if (prev != btn.idCommand) + { + TRACE("Setting Hot item to %d\n", index); + m_menuBand->_ChangeHotItem(this, index, 0); + } + return S_OK; + } + if (dwSelectType == VK_UP) { index--; @@ -879,33 +927,6 @@ index++; } } - - TBBUTTON btn = { 0 }; - while (index >= 0 && index < count) - { - DWORD res = SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); - if (!res) - return E_FAIL; - - if (btn.dwData) - { - if (prev != btn.idCommand) - { - TRACE("Setting Hot item to %d\n", index); - m_menuBand->_ChangeHotItem(this, index, 0); - } - return S_OK; - } - - if (dwSelectType == VK_UP) - { - index--; - } - else if (dwSelectType == VK_DOWN) - { - index++; - } - } } if (prev != -1) @@ -980,6 +1001,15 @@ return S_OK; } +HRESULT CMenuToolbarBase::ClearToolbar() +{ + while (SendMessage(m_hwndToolbar, TB_DELETEBUTTON, 0, 0)) + { + // empty; + } + return S_OK; +} + HRESULT CMenuToolbarBase::GetDataFromId(INT iItem, INT* pIndex, DWORD_PTR* pData) { if (pData) @@ -1086,10 +1116,7 @@ if (clearFirst) { - while (SendMessage(m_hwndToolbar, TB_DELETEBUTTON, 0, 0)) - { - // empty; - } + ClearToolbar(); } int count = 0; @@ -1141,7 +1168,7 @@ return S_OK; } -HRESULT CMenuStaticToolbar::GetInfoTip(LPWSTR pszText, INT cchTextMax, INT iItem, INT index, DWORD_PTR dwData) +HRESULT CMenuStaticToolbar::InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax) { //SMINFO * info = reinterpret_cast<SMINFO*>(dwData); UNIMPLEMENTED; @@ -1154,19 +1181,20 @@ return S_OK; } -HRESULT CMenuStaticToolbar::OnContextMenu(NMMOUSE * rclick) +HRESULT CMenuStaticToolbar::InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt) { CComPtr<IContextMenu> contextMenu; - HRESULT hr = m_menuBand->_CallCBWithItemId(rclick->dwItemSpec, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu)); + HRESULT hr = m_menuBand->_CallCBWithItemId(iItem, SMC_GETOBJECT, + reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu)); if (hr != S_OK) return hr; - return DoContextMenu(contextMenu); -} - -HRESULT CMenuStaticToolbar::OnCommandInternal(WPARAM wParam, LPARAM lParam, LRESULT *theResult) -{ - return m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); + return TrackContextMenu(contextMenu, pt); +} + +HRESULT CMenuStaticToolbar::InternalExecuteItem(INT iItem, INT index, DWORD_PTR data) +{ + return m_menuBand->_CallCBWithItemId(iItem, SMC_EXEC, 0, 0); } HRESULT CMenuStaticToolbar::InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData) @@ -1214,7 +1242,7 @@ PWSTR MenuString; IEnumIDList * eidl; - m_shellFolder->EnumObjects(m_hwndToolbar, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); + m_shellFolder->EnumObjects(GetToolbar(), SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); LPITEMIDLIST item = static_cast<LPITEMIDLIST>(CoTaskMemAlloc(sizeof(ITEMIDLIST))); ULONG fetched; @@ -1259,7 +1287,7 @@ return hr; } -HRESULT CMenuSFToolbar::GetInfoTip(LPWSTR pszText, INT cchTextMax, INT iItem, INT index, DWORD_PTR dwData) +HRESULT CMenuSFToolbar::InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax) { //ITEMIDLIST * pidl = reinterpret_cast<LPITEMIDLIST>(dwData); UNIMPLEMENTED; @@ -1312,25 +1340,27 @@ return hr; } -HRESULT CMenuSFToolbar::OnContextMenu(NMMOUSE * rclick) +HRESULT CMenuSFToolbar::InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt) { HRESULT hr; - CComPtr<IContextMenu> contextMenu; - LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(rclick->dwItemData); - - hr = m_shellFolder->GetUIObjectOf(m_hwndToolbar, 1, &pidl, IID_IContextMenu, NULL, reinterpret_cast<VOID **>(&contextMenu)); - if (hr != S_OK) + CComPtr<IContextMenu> contextMenu = NULL; + LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(dwData); + +#define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) + + hr = m_shellFolder->GetUIObjectOf(GetToolbar(), 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &contextMenu)); + if (FAILED_UNEXPECTEDLY(hr)) + { return hr; - - return DoContextMenu(contextMenu); -} - -HRESULT CMenuSFToolbar::OnCommandInternal(WPARAM wParam, LPARAM lParam, LRESULT *theResult) -{ - DWORD_PTR data; - - GetDataFromId(wParam, NULL, &data); - + } + + hr = TrackContextMenu(contextMenu, pt); + + return hr; +} + +HRESULT CMenuSFToolbar::InternalExecuteItem(INT iItem, INT index, DWORD_PTR data) +{ return m_menuBand->_CallCBWithItemPidl(reinterpret_cast<LPITEMIDLIST>(data), SMC_SFEXEC, 0, 0); } @@ -1348,14 +1378,7 @@ if (!pidl) return E_FAIL; -#if USE_SYSTEM_MENUBAND - hr = CoCreateInstance(CLSID_MenuBand, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &shellMenu)); -#else hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &shellMenu)); -#endif if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Tue Apr 15 10:08:08 2014 @@ -25,20 +25,19 @@ #define WM_USER_ISTRACKEDITEM (WM_APP+41) #define WM_USER_CHANGETRACKEDITEM (WM_APP+42) - class CMenuToolbarBase { private: - HWND m_hwnd; // May be the pager - HFONT m_marlett; - BOOL m_useFlatMenus; + HWND m_hwnd; // May be the pager + HWND m_hwndToolbar; + HFONT m_marlett; + BOOL m_useFlatMenus; WNDPROC m_SubclassOld; - BOOL m_disableMouseTrack; - BOOL m_timerEnabled; + BOOL m_disableMouseTrack; + BOOL m_timerEnabled; protected: CMenuBand * m_menuBand; - HWND m_hwndToolbar; DWORD m_dwMenuFlags; BOOL m_hasSizes; SIZE m_idealSize; @@ -54,6 +53,8 @@ private: static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + + LRESULT SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); public: CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager); @@ -72,7 +73,7 @@ HRESULT PopupSubMenu(UINT itemId, UINT index, IShellMenu* childShellMenu); HRESULT PopupSubMenu(UINT itemId, UINT index, HMENU menu); - HRESULT DoContextMenu(IContextMenu* contextMenu); + HRESULT TrackContextMenu(IContextMenu* contextMenu, POINT pt); HRESULT KeyboardItemChange(DWORD changeType); @@ -87,8 +88,7 @@ HRESULT DisableMouseTrack(BOOL bDisable); virtual HRESULT FillToolbar(BOOL clearFirst=FALSE) = 0; - virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0; - + HRESULT CancelCurrentPopup(); HRESULT PopupItem(INT iItem); HRESULT GetDataFromId(INT iItem, INT* pIndex, DWORD_PTR* pData); @@ -96,26 +96,28 @@ HRESULT KillPopupTimer(); protected: - virtual HRESULT OnCommandInternal(WPARAM wParam, LPARAM lParam, LRESULT *theResult) = 0; + virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb) = 0; - virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb) = 0; + virtual HRESULT InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax) = 0; + virtual HRESULT InternalExecuteItem(INT iItem, INT index, DWORD_PTR dwData) = 0; virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData) = 0; virtual HRESULT InternalHasSubMenu(INT iItem, INT index, DWORD_PTR dwData) = 0; - - virtual HRESULT GetInfoTip(LPWSTR pszText, INT cchTextMax, INT iItem, INT index, DWORD_PTR dwData)=0; - - LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + virtual HRESULT InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt) = 0; HRESULT AddButton(DWORD commandId, LPCWSTR caption, BOOL hasSubMenu, INT iconId, DWORD_PTR buttonData, BOOL last); HRESULT AddSeparator(BOOL last); HRESULT AddPlaceholder(); + HRESULT ClearToolbar(); + HWND GetToolbar() { return m_hwndToolbar; } + +private: HRESULT UpdateImageLists(); -private: HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); HRESULT OnPagerCalcSize(LPNMPGCALCSIZE csize); HRESULT OnPopupTimer(DWORD timerId); + HRESULT OnContextMenu(NMMOUSE * rclick); HRESULT OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResult); HRESULT OnGetInfoTip(NMTBGETINFOTIP * tip); }; @@ -134,16 +136,15 @@ HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); virtual HRESULT FillToolbar(BOOL clearFirst=FALSE); - virtual HRESULT OnCommandInternal(WPARAM wParam, LPARAM lParam, LRESULT *theResult); - virtual HRESULT OnContextMenu(NMMOUSE * rclick); protected: virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb); - virtual HRESULT GetInfoTip(LPWSTR pszText, INT cchTextMax, INT iItem, INT index, DWORD_PTR dwData); - + virtual HRESULT InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax); + virtual HRESULT InternalExecuteItem(INT iItem, INT index, DWORD_PTR dwData); virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData); virtual HRESULT InternalHasSubMenu(INT iItem, INT index, DWORD_PTR dwData); + virtual HRESULT InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt); }; class CMenuSFToolbar : @@ -162,14 +163,13 @@ HRESULT GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); virtual HRESULT FillToolbar(BOOL clearFirst=FALSE); - virtual HRESULT OnCommandInternal(WPARAM wParam, LPARAM lParam, LRESULT *theResult); - virtual HRESULT OnContextMenu(NMMOUSE * rclick); protected: virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb); - virtual HRESULT GetInfoTip(LPWSTR pszText, INT cchTextMax, INT iItem, INT index, DWORD_PTR dwData); - + virtual HRESULT InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax); + virtual HRESULT InternalExecuteItem(INT iItem, INT index, DWORD_PTR dwData); virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData); virtual HRESULT InternalHasSubMenu(INT iItem, INT index, DWORD_PTR dwData); + virtual HRESULT InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt); }; Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Tue Apr 15 10:08:08 2014 @@ -148,14 +148,7 @@ case IDM_DOCUMENTS: csidl = CSIDL_RECENT; break; } -#if USE_SYSTEM_MENUBAND - hr = CoCreateInstance(CLSID_MenuBand, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &pShellMenu)); -#else hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); -#endif if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -291,36 +284,15 @@ IShellFolder *psfStartMenuAll; #endif -#if USE_SYSTEM_MENUBAND - hr = CoCreateInstance(CLSID_MenuBand, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &pShellMenu)); -#else hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); -#endif - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - -#if USE_SYSTEM_MENUSITE - hr = CoCreateInstance(CLSID_MenuBandSite, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IBandSite, &pBandSite)); -#else + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite)); -#endif - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - -#if USE_SYSTEM_MENUDESKBAR - hr = CoCreateInstance(CLSID_MenuDeskBar, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IDeskBar, &pDeskBar)); -#else + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); -#endif if (FAILED_UNEXPECTEDLY(hr)) return hr;

1 0

[jimtabor] 62751: - Fix AbiWord Crash when sizing.
by jimtabor＠svn.reactos.org 15 Apr '14

15 Apr '14

Author: jimtabor Date: Tue Apr 15 02:26:47 2014 New Revision: 62751 URL: http://svn.reactos.org/svn/reactos?rev=62751&view=rev Log: - Fix AbiWord Crash when sizing. Modified: trunk/reactos/win32ss/user/ntuser/callback.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Tue Apr 15 02:26:47 2014 @@ -97,9 +97,18 @@ *pWnd = ClientInfo->CallbackWnd.pWnd; *pActCtx = ClientInfo->CallbackWnd.pActCtx; - ClientInfo->CallbackWnd.hWnd = hWndS; - ClientInfo->CallbackWnd.pWnd = DesktopHeapAddressToUser(Window); - ClientInfo->CallbackWnd.pActCtx = Window->pActCtx; + if (Window) + { + ClientInfo->CallbackWnd.hWnd = hWndS; + ClientInfo->CallbackWnd.pWnd = DesktopHeapAddressToUser(Window); + ClientInfo->CallbackWnd.pActCtx = Window->pActCtx; + } + else //// What if Dispatching WM_SYS/TIMER with NULL window? Fix AbiWord Crash when sizing. + { + ClientInfo->CallbackWnd.hWnd = hWndS; + ClientInfo->CallbackWnd.pWnd = Window; + ClientInfo->CallbackWnd.pActCtx = 0; + } } static VOID

1 0

[jimtabor] 62750: [WineTests|User32] - Sync Edit to wine head.
by jimtabor＠svn.reactos.org 14 Apr '14

14 Apr '14

Author: jimtabor Date: Mon Apr 14 20:26:59 2014 New Revision: 62750 URL: http://svn.reactos.org/svn/reactos?rev=62750&view=rev Log: [WineTests|User32] - Sync Edit to wine head. Modified: trunk/rostests/winetests/user32/edit.c Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… ============================================================================== --- trunk/rostests/winetests/user32/edit.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/edit.c [iso-8859-1] Mon Apr 14 20:26:59 2014 @@ -1299,6 +1299,7 @@ len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); DestroyWindow(hWnd); + DestroyWindow(parentWnd); } /* Test WM_GETTEXT processing @@ -1423,6 +1424,8 @@ RECT old_rect, new_rect; INT old_right_margin; DWORD old_margins, new_margins; + LOGFONTA lf; + HFONT hfont; hwEdit = create_editcontrol(WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); @@ -1470,6 +1473,46 @@ ok(new_rect.bottom == old_rect.bottom, "The bottom border of the rectangle has changed\n"); DestroyWindow (hwEdit); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -11; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + strcpy(lf.lfFaceName, "Tahoma"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "got %p\n", hfont); + + /* Empty window rectangle */ + hwEdit = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL); + ok(hwEdit != NULL, "got %p\n", hwEdit); + GetClientRect(hwEdit, &old_rect); + ok(IsRectEmpty(&old_rect), "got rect %d,%d-%d,%d\n", old_rect.left, old_rect.top, old_rect.right, old_rect.bottom); + + old_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(old_margins == 0, "got %x\n", old_margins); + + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + old_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(HIWORD(old_margins) > 0 && LOWORD(old_margins) > 0, "got %d, %d\n", HIWORD(old_margins), LOWORD(old_margins)); + + DestroyWindow(hwEdit); + + /* Size is not enough to display a text, but not empty */ + hwEdit = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 2, 2, NULL, NULL, NULL, NULL); + ok(hwEdit != NULL, "got %p\n", hwEdit); + GetClientRect(hwEdit, &old_rect); + ok(!IsRectEmpty(&old_rect), "got rect %d,%d-%d,%d\n", old_rect.left, old_rect.top, old_rect.right, old_rect.bottom); + + old_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(old_margins == 0, "got %x\n", old_margins); + + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + old_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(old_margins == 0, "got %d, %d\n", HIWORD(old_margins), LOWORD(old_margins)); + + DeleteObject(hfont); + DestroyWindow(hwEdit); } static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) @@ -2132,8 +2175,8 @@ destroy_child_editcontrol(hwEdit); } -static int got_en_setfocus = 0; -static int got_wm_capturechanged = 0; +static BOOL got_en_setfocus = FALSE; +static BOOL got_wm_capturechanged = FALSE; static LRESULT (CALLBACK *p_edit_proc)(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -2142,14 +2185,14 @@ case WM_COMMAND: switch (HIWORD(wParam)) { case EN_SETFOCUS: - got_en_setfocus = 1; + got_en_setfocus = TRUE; break; } break; case WM_CAPTURECHANGED: if (hWnd != (HWND)lParam) { - got_wm_capturechanged = 1; + got_wm_capturechanged = TRUE; pEndMenu(); } break; @@ -2200,9 +2243,49 @@ return p_edit_proc(hWnd, msg, wParam, lParam); } +struct context_menu_messages +{ + unsigned int wm_command, em_setsel; +}; + +static struct context_menu_messages menu_messages; + +static LRESULT CALLBACK child_edit_menu_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) { + case WM_ENTERIDLE: + if (wParam == MSGF_MENU) { + HWND hwndMenu = (HWND)lParam; + MENUBARINFO mbi = { sizeof(MENUBARINFO) }; + if (pGetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) { + MENUITEMINFOA mii = { sizeof(MENUITEMINFOA), MIIM_STATE }; + if (GetMenuItemInfoA(mbi.hMenu, EM_SETSEL, FALSE, &mii)) { + if (mii.fState & MFS_HILITE) { + PostMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hwnd, WM_KEYUP, VK_RETURN, 0x1c0001); + } + else { + PostMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0x500001); + PostMessageA(hwnd, WM_KEYUP, VK_DOWN, 0x500001); + } + } + } + } + break; + case WM_COMMAND: + menu_messages.wm_command++; + break; + case EM_SETSEL: + menu_messages.em_setsel++; + break; + } + return CallWindowProcA(p_edit_proc, hwnd, msg, wParam, lParam); +} + static void test_contextmenu(void) { HWND hwndMain, hwndEdit; + MSG msg; hwndMain = CreateWindowA(szEditTest4Class, "ET4", WS_OVERLAPPEDWINDOW|WS_VISIBLE, 0, 0, 200, 200, NULL, NULL, hinst, NULL); @@ -2225,6 +2308,25 @@ p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); } + + DestroyWindow (hwndEdit); + + hwndEdit = CreateWindowA("EDIT", "Test Text", + WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, 100, 100, + hwndMain, NULL, hinst, NULL); + memset(&menu_messages, 0, sizeof(menu_messages)); + p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, + (ULONG_PTR)child_edit_menu_proc); + + SetFocus(hwndEdit); + SendMessageA(hwndEdit, WM_SETTEXT, 0, (LPARAM)"foo"); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(-1, -1)); + while (PeekMessageA(&msg, hwndEdit, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok(menu_messages.wm_command == 0, + "Expected no WM_COMMAND messages, got %d\n", menu_messages.wm_command); + ok(menu_messages.em_setsel == 1, + "Expected 1 EM_SETSEL message, got %d\n", menu_messages.em_setsel); DestroyWindow (hwndEdit); DestroyWindow (hwndMain);

1 0

[jimtabor] 62749: [User32] - Patch by Nikolay Sivov : Fix Edit margins calculation for empty client area case. - Patch by Akihiro Sagawa : Emit EM_SETSEL message when choosing "Select All" from con...
by jimtabor＠svn.reactos.org 14 Apr '14

14 Apr '14

Author: jimtabor Date: Mon Apr 14 20:23:17 2014 New Revision: 62749 URL: http://svn.reactos.org/svn/reactos?rev=62749&view=rev Log: [User32] - Patch by Nikolay Sivov : Fix Edit margins calculation for empty client area case. - Patch by Akihiro Sagawa : Emit EM_SETSEL message when choosing "Select All" from context menu. Don' t emit WM_COMMAND on choosing an item in a context menu (Edit control). Modified: trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Mon Apr 14 20:23:17 2014 @@ -2918,7 +2918,7 @@ default_right_margin = tm.tmAveCharWidth / 2; min_size = calc_min_set_margin_size(dc, default_left_margin, default_right_margin); GetClientRect(es->hwndSelf, &rc); - if(rc.right - rc.left < min_size) { + if (!IsRectEmpty(&rc) && (rc.right - rc.left < min_size)) { default_left_margin = es->left_margin; default_right_margin = es->right_margin; } @@ -3252,17 +3252,14 @@ return 1; } -#if 0 // Removed see Revision 43925 comments. -/********************************************************************* - * - * WM_COMMAND - * - */ -static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND control) -{ - if (code || control) - return; - + +/********************************************************************* + * + * EDIT_ContextMenuCommand + * + */ +static void EDIT_ContextMenuCommand(EDITSTATE *es, UINT id) +{ switch (id) { case EM_UNDO: SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); @@ -3280,15 +3277,13 @@ SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0); break; case EM_SETSEL: - EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE); - EDIT_EM_ScrollCaret(es); + SendMessageW(es->hwndSelf, EM_SETSEL, 0, -1); break; default: ERR("unknown menu item, please report\n"); break; } } -#endif /********************************************************************* @@ -3313,8 +3308,8 @@ HMENU popup = GetSubMenu(menu, 0); UINT start = es->selection_start; UINT end = es->selection_end; - - BOOL selectedItem; // reactos r40667 + UINT cmd; + ORDER_UINT(start, end); /* undo */ @@ -3345,34 +3340,12 @@ if (!(es->flags & EF_FOCUSED)) SetFocus(es->hwndSelf); -#ifdef __REACTOS__ // r40667 - selectedItem = TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, es->hwndSelf, NULL); - // Added see Revision 43925 comments. - switch (selectedItem) { - case EM_UNDO: - SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); - break; - case WM_CUT: - SendMessageW(es->hwndSelf, WM_CUT, 0, 0); - break; - case WM_COPY: - SendMessageW(es->hwndSelf, WM_COPY, 0, 0); - break; - case WM_PASTE: - SendMessageW(es->hwndSelf, WM_PASTE, 0, 0); - break; - case WM_CLEAR: - SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0); - break; - case EM_SETSEL: - EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE); - EDIT_EM_ScrollCaret(es); - break; - default: - ERR("unknown menu item, please report\n"); - break; - } -#endif + cmd = TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD | TPM_NONOTIFY, + x, y, 0, es->hwndSelf, NULL); + + if (cmd) + EDIT_ContextMenuCommand(es, cmd); + DestroyMenu(menu); } @@ -5049,11 +5022,7 @@ case WM_CLEAR: EDIT_WM_Clear(es); break; -#if 0 // Removed see Revision 43925 comments. - case WM_COMMAND: - EDIT_WM_Command(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam); - break; -#endif + case WM_CONTEXTMENU: EDIT_WM_ContextMenu(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break;

1 0

[jimtabor] 62748: [Win32k] - Switch menu allocation to desktop stack.
by jimtabor＠svn.reactos.org 14 Apr '14

14 Apr '14

Author: jimtabor Date: Mon Apr 14 06:54:41 2014 New Revision: 62748 URL: http://svn.reactos.org/svn/reactos?rev=62748&view=rev Log: [Win32k] - Switch menu allocation to desktop stack. Modified: trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/user32/misc/misc.c Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Mon Apr 14 06:54:41 2014 @@ -337,7 +337,7 @@ switch (type) { case TYPE_WINDOW: -// case TYPE_MENU: + case TYPE_MENU: case TYPE_HOOK: case TYPE_CALLPROC: case TYPE_INPUTCONTEXT: @@ -436,7 +436,7 @@ switch (type) { case TYPE_WINDOW: -// case TYPE_MENU: + case TYPE_MENU: case TYPE_HOOK: case TYPE_CALLPROC: case TYPE_INPUTCONTEXT: Modified: trunk/reactos/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/m… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] Mon Apr 14 06:54:41 2014 @@ -311,7 +311,7 @@ { FALSE, /* TYPE_FREE (not used) */ FALSE, /* TYPE_WINDOW */ - TRUE, /* TYPE_MENU FALSE */ + FALSE, /* TYPE_MENU */ TRUE, /* TYPE_CURSOR */ TRUE, /* TYPE_SETWINDOWPOS */ FALSE, /* TYPE_HOOK */ @@ -324,7 +324,7 @@ TRUE, /* TYPE_MONITOR */ FALSE, /* TYPE_KBDLAYOUT */ FALSE, /* TYPE_KBDFILE */ - TRUE, /* TYPE_WINEVENTHOOK */ + TRUE, /* TYPE_WINEVENTHOOK */ FALSE, /* TYPE_TIMER */ FALSE, /* TYPE_INPUTCONTEXT */ FALSE, /* TYPE_HIDDATA */

1 0

[jimtabor] 62747: [User32] - Fixed get menu info, check parameters first than the handle. See CORE-8064.
by jimtabor＠svn.reactos.org 14 Apr '14

14 Apr '14

Author: jimtabor Date: Mon Apr 14 06:05:34 2014 New Revision: 62747 URL: http://svn.reactos.org/svn/reactos?rev=62747&view=rev Log: [User32] - Fixed get menu info, check parameters first than the handle. See CORE-8064. Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Mon Apr 14 06:05:34 2014 @@ -4269,14 +4269,14 @@ BOOL res = FALSE; PVOID pMenu; - if (!(pMenu = ValidateHandle(hmenu, TYPE_MENU))) - return FALSE; - if (!lpcmi || (lpcmi->cbSize != sizeof(MENUINFO))) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + + if (!(pMenu = ValidateHandle(hmenu, TYPE_MENU))) + return FALSE; RtlZeroMemory(&mi, sizeof(MENUINFO)); mi.cbSize = sizeof(MENUINFO);

1 0

[jimtabor] 62746: [User32] - Patch by Victor Martinez Calvo : Fix Invalid parameter handling in GetMenuInfo and SetLastError. Modified handle validation by me. See CORE-8064. - Moved code and added...
by jimtabor＠svn.reactos.org 14 Apr '14

14 Apr '14

Author: jimtabor Date: Mon Apr 14 05:43:02 2014 New Revision: 62746 URL: http://svn.reactos.org/svn/reactos?rev=62746&view=rev Log: [User32] - Patch by Victor Martinez Calvo : Fix Invalid parameter handling in GetMenuInfo and SetLastError. Modified handle validation by me. See CORE-8064. - Moved code and added a non-client create function ID. Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Mon Apr 14 05:43:02 2014 @@ -1147,9 +1147,8 @@ if ( (Wnd->style & WS_MINIMIZE)) { UserGetInsideRectNC(Wnd, &rect); - UserDrawSysMenuButton(hWnd, hdc, &rect, - lpitem->fState & (MF_HILITE | MF_MOUSESELECT)); - } + UserDrawSysMenuButton(hWnd, hdc, &rect, lpitem->fState & (MF_HILITE | MF_MOUSESELECT)); + } return; } @@ -1816,6 +1815,10 @@ { if (!pWnd->fnid) { + if (Message != WM_NCCREATE) + { + return DefWindowProcA(Wnd, Message, wParam, lParam); + } NtUserSetWindowFNID(Wnd, FNID_MENU); } else @@ -4264,9 +4267,16 @@ { ROSMENUINFO mi; BOOL res = FALSE; - - if(!lpcmi || (lpcmi->cbSize != sizeof(MENUINFO))) - return FALSE; + PVOID pMenu; + + if (!(pMenu = ValidateHandle(hmenu, TYPE_MENU))) + return FALSE; + + if (!lpcmi || (lpcmi->cbSize != sizeof(MENUINFO))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } RtlZeroMemory(&mi, sizeof(MENUINFO)); mi.cbSize = sizeof(MENUINFO);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs