Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 62234: [kernel32] sync format_msg.c with wine 1.7.11
by cwittich＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: cwittich Date: Mon Feb 17 21:51:48 2014 New Revision: 62234 URL: http://svn.reactos.org/svn/reactos?rev=62234&view=rev Log: [kernel32] sync format_msg.c with wine 1.7.11 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] Mon Feb 17 21:51:48 2014 @@ -115,7 +115,7 @@ DWORD flags, struct format_args *args, LPWSTR *result ) { - static const WCHAR fmt_lu[] = {'%','l','u',0}; + static const WCHAR fmt_u[] = {'%','u',0}; WCHAR *wstring = NULL, *p, fmt[256]; ULONG_PTR arg; int size; @@ -155,7 +155,7 @@ { if (*format == '*') { - p += sprintfW( p, fmt_lu, get_arg( insert, flags, args )); + p += sprintfW( p, fmt_u, get_arg( insert, flags, args )); insert = -1; format++; } @@ -168,7 +168,7 @@ *p++ = *format++; if (*format == '*') { - p += sprintfW( p, fmt_lu, get_arg( insert, flags, args )); + p += sprintfW( p, fmt_u, get_arg( insert, flags, args )); insert = -1; format++; } @@ -198,7 +198,7 @@ (unicode_caller && format[0] == 'C') || (!unicode_caller && format[0] == 'c')) { - char ch = (char)arg; + char ch = arg; wstring = HeapAlloc( GetProcessHeap(), 0, 2 * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, &ch, 1, wstring, 1 ); wstring[1] = 0; @@ -249,31 +249,85 @@ return format; } +struct _format_message_data +{ + LPWSTR formatted; + DWORD size; + LPWSTR t; + LPWSTR space; + BOOL inspace; + DWORD width, w; +}; + +static void format_add_char(struct _format_message_data *fmd, WCHAR c) +{ + *fmd->t++ = c; + if (fmd->width && fmd->width != FORMAT_MESSAGE_MAX_WIDTH_MASK) + { + switch (c) { + case '\r': + case '\n': + fmd->space = NULL; + fmd->inspace = FALSE; + fmd->w = 0; + break; + case ' ': + if (!fmd->inspace) + fmd->space = fmd->t - 1; + fmd->inspace = TRUE; + fmd->w++; + break; + default: + fmd->inspace = FALSE; + fmd->w++; + } + if (fmd->w == fmd->width) { + LPWSTR notspace; + if (fmd->space) { + notspace = fmd->space; + while (*notspace == ' ' && notspace != fmd->t) + notspace++; + } else + notspace = fmd->space = fmd->t; + fmd->w = fmd->t - notspace; + memmove(fmd->space+2, notspace, fmd->w * sizeof(*fmd->t)); + *fmd->space++ = '\r'; + *fmd->space++ = '\n'; + fmd->t = fmd->space + fmd->w; + fmd->space = NULL; + fmd->inspace = FALSE; + } + } + if ((DWORD)(fmd->t - fmd->formatted) == fmd->size) { + DWORD_PTR ispace = fmd->space - fmd->formatted; + /* Allocate two extra characters so we can insert a '\r\n' in + * the middle of a word. + */ + fmd->formatted = HeapReAlloc(GetProcessHeap(), 0, fmd->formatted, (fmd->size * 2 + 2) * sizeof(WCHAR)); + fmd->t = fmd->formatted + fmd->size; + if (fmd->space) + fmd->space = fmd->formatted + ispace; + fmd->size *= 2; + } +} + /********************************************************************** * format_message (internal) */ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr, struct format_args *format_args ) { - LPWSTR target,t; - DWORD talloced; + struct _format_message_data fmd; LPCWSTR f; - DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; - WCHAR ch; - - target = t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) ); - talloced = 100; - -#define ADD_TO_T(c) do {\ - *t++=c;\ - if ((DWORD)(t-target) == talloced) {\ - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\ - t = target+talloced;\ - talloced*=2;\ - } \ -} while (0) - + + fmd.size = 100; + fmd.formatted = fmd.t = HeapAlloc( GetProcessHeap(), 0, (fmd.size + 2) * sizeof(WCHAR) ); + + fmd.width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; + fmd.w = 0; + fmd.inspace = FALSE; + fmd.space = NULL; f = fmtstr; while (*f && !eos) { if (*f=='%') { @@ -290,7 +344,7 @@ (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) && !format_args->list)) { SetLastError(ERROR_INVALID_PARAMETER); - HeapFree(GetProcessHeap(), 0, target); + HeapFree(GetProcessHeap(), 0, fmd.formatted); return NULL; } insertnr = *f-'0'; @@ -307,20 +361,20 @@ break; } f = format_insert( unicode_caller, insertnr, f, dwFlags, format_args, &str ); - for (x = str; *x; x++) ADD_TO_T(*x); + for (x = str; *x; x++) format_add_char(&fmd, *x); HeapFree( GetProcessHeap(), 0, str ); break; case 'n': - ADD_TO_T('\r'); - ADD_TO_T('\n'); + format_add_char(&fmd, '\r'); + format_add_char(&fmd, '\n'); f++; break; case 'r': - ADD_TO_T('\r'); + format_add_char(&fmd, '\r'); f++; break; case 't': - ADD_TO_T('\t'); + format_add_char(&fmd, '\t'); f++; break; case '0': @@ -329,53 +383,51 @@ break; case '\0': SetLastError(ERROR_INVALID_PARAMETER); - HeapFree(GetProcessHeap(), 0, target); + HeapFree(GetProcessHeap(), 0, fmd.formatted); return NULL; ignore_inserts: default: if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) - ADD_TO_T('%'); - ADD_TO_T(*f++); + format_add_char(&fmd, '%'); + format_add_char(&fmd, *f++); break; } } else { - ch = *f; + WCHAR ch = *f; f++; if (ch == '\r') { if (*f == '\n') f++; - if(width) - ADD_TO_T(' '); + if(fmd.width) + format_add_char(&fmd, ' '); else { - ADD_TO_T('\r'); - ADD_TO_T('\n'); + format_add_char(&fmd, '\r'); + format_add_char(&fmd, '\n'); } } else { if (ch == '\n') { - if(width) - ADD_TO_T(' '); + if(fmd.width) + format_add_char(&fmd, ' '); else { - ADD_TO_T('\r'); - ADD_TO_T('\n'); + format_add_char(&fmd, '\r'); + format_add_char(&fmd, '\n'); } } else - ADD_TO_T(ch); + format_add_char(&fmd, ch); } } } - *t = '\0'; - - return target; + *fmd.t = '\0'; + + return fmd.formatted; } -#undef ADD_TO_T /*********************************************************************** * FormatMessageA (KERNEL32.@) - * FIXME: missing wrap, */ DWORD WINAPI FormatMessageA( DWORD dwFlags, @@ -391,7 +443,6 @@ LPWSTR target; DWORD destlength; LPWSTR from; - DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); @@ -420,8 +471,6 @@ format_args.last = 0; } - if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) - FIXME("line wrapping (%u) not supported.\n", width); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { @@ -432,9 +481,9 @@ else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM)) { if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_message( (HMODULE)lpSource, dwMessageId, (WORD)dwLanguageId ); + from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_message( kernel32_handle, dwMessageId, (WORD)dwLanguageId ); + from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); if (!from) return 0; } else @@ -497,7 +546,6 @@ LPWSTR target; DWORD talloced; LPWSTR from; - DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); @@ -524,8 +572,6 @@ format_args.last = 0; } - if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) - FIXME("line wrapping not supported.\n"); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { from = HeapAlloc( GetProcessHeap(), 0, (strlenW(lpSource) + 1) * @@ -535,9 +581,9 @@ else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM)) { if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_message( (HMODULE)lpSource, dwMessageId, (WORD)dwLanguageId ); + from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_message( kernel32_handle, dwMessageId, (WORD)dwLanguageId ); + from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); if (!from) return 0; } else

1 0

[cwittich] 62233: [comctl32] sync rebar to wine 1.7.11
by cwittich＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: cwittich Date: Mon Feb 17 20:09:46 2014 New Revision: 62233 URL: http://svn.reactos.org/svn/reactos?rev=62233&view=rev Log: [comctl32] sync rebar to wine 1.7.11 Modified: trunk/reactos/dll/win32/comctl32/rebar.c Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Mon Feb 17 20:09:46 2014 @@ -2514,8 +2514,10 @@ /* initialize band */ memset(lpBand, 0, sizeof(*lpBand)); - lpBand->clrFore = infoPtr->clrText; - lpBand->clrBack = infoPtr->clrBk; + lpBand->clrFore = infoPtr->clrText == CLR_NONE ? infoPtr->clrBtnText : + infoPtr->clrText; + lpBand->clrBack = infoPtr->clrBk == CLR_NONE ? infoPtr->clrBtnFace : + infoPtr->clrBk; lpBand->iImage = -1; REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand);

1 0

[dquintana] 62232: [RSHELL] * CMenuBand: Begin implementing submenus for shell items. * CMenuBand: Begin implementing context menus. CORE-7881
by dquintana＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: dquintana Date: Mon Feb 17 18:38:31 2014 New Revision: 62232 URL: http://svn.reactos.org/svn/reactos?rev=62232&view=rev Log: [RSHELL] * CMenuBand: Begin implementing submenus for shell items. * CMenuBand: Begin implementing context menus. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp 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] Mon Feb 17 18:38:31 2014 @@ -51,10 +51,11 @@ virtual HRESULT PopupItem(UINT uItem) = 0; virtual HRESULT HasSubMenu(UINT uItem) = 0; virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) = 0; + virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0; HRESULT OnHotItemChange(const NMTBHOTITEM * hot); - HRESULT PopupSubMenu(UINT uItem, IShellMenu* childShellMenu); + HRESULT PopupSubMenu(UINT index, IShellMenu* childShellMenu); static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); protected: @@ -83,6 +84,8 @@ virtual HRESULT PopupItem(UINT uItem); virtual HRESULT HasSubMenu(UINT uItem); virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT OnContextMenu(NMMOUSE * rclick); + private: HMENU m_hmenu; }; @@ -100,9 +103,10 @@ virtual HRESULT PopupItem(UINT uItem); virtual HRESULT HasSubMenu(UINT uItem); virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); - + virtual HRESULT OnContextMenu(NMMOUSE * rclick); private: + LPITEMIDLIST GetPidlFromId(UINT uItem, INT* pIndex); IShellFolder * m_shellFolder; LPCITEMIDLIST m_idList; @@ -248,6 +252,7 @@ virtual HRESULT STDMETHODCALLTYPE IsEmpty(THIS); HRESULT CallCBWithId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam); + HRESULT CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam); BOOL UseBigIcons() { return m_useBigIcons; @@ -957,15 +962,14 @@ return S_OK; } -HRESULT CMenuToolbarBase::PopupSubMenu(UINT uItem, IShellMenu* childShellMenu) -{ +HRESULT CMenuToolbarBase::PopupSubMenu(UINT index, IShellMenu* childShellMenu) +{ + IBandSite* pBandSite; + IDeskBar* pDeskBar; + + HRESULT hr; + RECT rc; - TBBUTTONINFO info = { 0 }; - info.cbSize = sizeof(TBBUTTONINFO); - info.dwMask = 0; - int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, (LPARAM) &info); - if (index < 0) - return E_FAIL; if (!SendMessage(m_hwnd, TB_GETITEMRECT, index, (LPARAM) &rc)) return E_FAIL; @@ -978,10 +982,6 @@ POINTL pt = { b.x, b.y }; RECTL rcl = { a.x, a.y, b.x, b.y }; // maybe-TODO: fetch client area of deskbar? - IBandSite* pBandSite; - IDeskBar* pDeskBar; - - HRESULT hr; #ifndef USE_BUILTIN_MENUSITE hr = CoCreateInstance(CLSID_MenuBandSite, @@ -1119,6 +1119,56 @@ return S_OK; } +HRESULT CMenuStaticToolbar::OnContextMenu(NMMOUSE * rclick) +{ + CComPtr<IContextMenu> contextMenu; + HRESULT hr = m_menuBand->CallCBWithId(rclick->dwItemSpec, SMC_GETOBJECT, (WPARAM) &IID_IContextMenu, (LPARAM) &contextMenu); + if (hr != S_OK) + return hr; + + HMENU hPopup = CreatePopupMenu(); + + if (hPopup == NULL) + return E_FAIL; + + int ID_SHELL_CMD_FIRST = 0xF; + int ID_SHELL_CMD_LAST = 0x7fef; + hr = contextMenu->QueryContextMenu(hPopup, 0, ID_SHELL_CMD_FIRST, ID_SHELL_CMD_LAST, CMF_VERBSONLY); + if (FAILED(hr)) + { + DestroyMenu(hPopup); + return hr; + } + + POINT pt = rclick->pt; + if (!ClientToScreen(m_hwnd, &pt)) + { + DestroyMenu(hPopup); + return HRESULT_FROM_WIN32(GetLastError()); + } + + CComPtr<IOleWindow> site; + hr = m_menuBand->GetSite(IID_PPV_ARG(IOleWindow, &site)); + if (FAILED(hr)) + { + DestroyMenu(hPopup); + return hr; + } + + HWND hwndSite; + hr = site->GetWindow(&hwndSite); + if (FAILED(hr)) + { + DestroyMenu(hPopup); + return hr; + } + + ::TrackPopupMenu(hPopup, 0, pt.x, pt.y, 0, hwndSite, NULL); + + DestroyMenu(hPopup); + return S_OK; +} + HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { return m_menuBand->CallCBWithId(wParam, SMC_EXEC, 0, 0); @@ -1131,7 +1181,14 @@ if (FAILED(hr)) return hr; - return PopupSubMenu(uItem, shellMenu); + TBBUTTONINFO info = { 0 }; + info.cbSize = sizeof(TBBUTTONINFO); + info.dwMask = 0; + int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, (LPARAM) &info); + if (index < 0) + return E_FAIL; + + return PopupSubMenu(index, shellMenu); } HRESULT CMenuStaticToolbar::HasSubMenu(UINT uItem) @@ -1175,7 +1232,7 @@ INT index = 0; INT indexOpen = 0; - IShellItem *psi; + CComPtr<IShellItem> psi; SHCreateShellItem(NULL, m_shellFolder, item, &psi); hr = psi->GetDisplayName(SIGDN_NORMALDISPLAY, &MenuString); @@ -1184,9 +1241,18 @@ index = SHMapPIDLToSystemImageListIndex(m_shellFolder, item, &indexOpen); + SFGAOF attrs; + hr = psi->GetAttributes(SFGAO_FOLDER, &attrs); + + if (attrs != 0) + { + tbb.fsStyle |= BTNS_WHOLEDROPDOWN; + } + tbb.idCommand = i++; tbb.iString = (INT_PTR) MenuString; tbb.iBitmap = index; + tbb.dwData = (DWORD_PTR) ILClone(item); SendMessageW(m_hwnd, TB_ADDBUTTONS, 1, (LPARAM) (LPTBBUTTON) &tbb); HeapFree(GetProcessHeap(), 0, MenuString); @@ -1236,20 +1302,104 @@ return hr; } + +LPITEMIDLIST CMenuSFToolbar::GetPidlFromId(UINT uItem, INT* pIndex) +{ + TBBUTTONINFO info = { 0 }; + info.cbSize = sizeof(TBBUTTONINFO); + info.dwMask = 0; + int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, (LPARAM) &info); + if (index < 0) + return NULL; + + if (pIndex) + *pIndex = index; + + TBBUTTON btn = { 0 }; + if (!SendMessage(m_hwnd, TB_GETBUTTON, index, (LPARAM) &btn)) + return NULL; + + return (LPITEMIDLIST)btn.dwData; +} + +HRESULT CMenuSFToolbar::OnContextMenu(NMMOUSE * rclick) +{ + HRESULT hr; + CComPtr<IOleWindow> site; + CComPtr<IContextMenu> contextMenu; + + hr = m_menuBand->GetSite(IID_PPV_ARG(IOleWindow, &site)); + if (FAILED(hr)) + { + return hr; + } + + HWND hwndSite; + hr = site->GetWindow(&hwndSite); + if (FAILED(hr)) + { + return hr; + } + + LPITEMIDLIST pidl = GetPidlFromId(rclick->dwItemData, NULL); + + hr = m_shellFolder->GetUIObjectOf(hwndSite, 1, (LPCITEMIDLIST *) &pidl, IID_IContextMenu, NULL, (PVOID *) &contextMenu); + if (hr != S_OK) + return hr; + + HMENU hPopup = CreatePopupMenu(); + + if (hPopup == NULL) + return E_FAIL; + + int ID_SHELL_CMD_FIRST = 0xF; + int ID_SHELL_CMD_LAST = 0x7fef; + hr = contextMenu->QueryContextMenu(hPopup, 0, ID_SHELL_CMD_FIRST, ID_SHELL_CMD_LAST, CMF_VERBSONLY); + if (FAILED(hr)) + { + DestroyMenu(hPopup); + return hr; + } + + POINT pt = rclick->pt; + if (!ClientToScreen(m_hwnd, &pt)) + { + DestroyMenu(hPopup); + return HRESULT_FROM_WIN32(GetLastError()); + } + + ::TrackPopupMenu(hPopup, 0, pt.x, pt.y, 0, hwndSite, NULL); + + DestroyMenu(hPopup); + return S_OK; +} + HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - // TODO: return m_menuBand->CallCBWithPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); - return S_OK; + return m_menuBand->CallCBWithPidl(GetPidlFromId(wParam, NULL), SMC_SFEXEC, 0, 0); } HRESULT CMenuSFToolbar::PopupItem(UINT uItem) { - return S_OK; + int index; + CComPtr<IShellMenu> shellMenu; + HRESULT hr = m_menuBand->CallCBWithPidl(GetPidlFromId(uItem, &index), SMC_GETOBJECT, (WPARAM) &IID_IShellMenu, (LPARAM) &shellMenu); + if (FAILED(hr)) + return hr; + + return PopupSubMenu(index, shellMenu); } HRESULT CMenuSFToolbar::HasSubMenu(UINT uItem) { - return S_FALSE; // GetSubMenu(m_hmenu, uItem) ? S_OK : S_FALSE; + HRESULT hr; + CComPtr<IShellItem> psi; + SHCreateShellItem(NULL, m_shellFolder, GetPidlFromId(uItem, NULL), &psi); + + SFGAOF attrs; + hr = psi->GetAttributes(SFGAO_FOLDER, &attrs); + + return (attrs != 0) ? S_OK : S_FALSE; } CMenuBand::CMenuBand() : @@ -1811,6 +1961,7 @@ NMHDR * hdr = (LPNMHDR) lParam; NMTBCUSTOMDRAW * cdraw; NMTBHOTITEM * hot; + NMMOUSE * rclick; switch (hdr->code) { case TBN_HOTITEMCHANGE: @@ -1828,6 +1979,20 @@ return S_OK; + case NM_RCLICK: + rclick = (LPNMMOUSE) hdr; + + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) + { + return m_staticToolbar->OnContextMenu(rclick); + } + + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) + { + return m_SFToolbar->OnContextMenu(rclick); + } + + return S_OK; case NM_CUSTOMDRAW: cdraw = (LPNMTBCUSTOMDRAW) hdr; switch (cdraw->nmcd.dwDrawStage) @@ -1984,7 +2149,7 @@ return hr; } -HRESULT CMenuBand::_CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam) +HRESULT CMenuBand::CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam) { if (!m_psmc) return S_FALSE; @@ -1997,6 +2162,7 @@ smData.uIdParent = m_uId; smData.uIdAncestor = m_uIdAncestor; smData.hwnd = hwnd; + smData.pidlItem = pidl; if (m_staticToolbar) { smData.hmenu = m_hmenu; @@ -2010,4 +2176,31 @@ smData.psf->Release(); return hr; } + +HRESULT CMenuBand::_CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (!m_psmc) + return S_FALSE; + + HWND hwnd; + GetWindow(&hwnd); + + SMDATA smData = { 0 }; + smData.punk = (IShellMenu2*)this; + smData.uIdParent = m_uId; + smData.uIdAncestor = m_uIdAncestor; + smData.hwnd = hwnd; + if (m_staticToolbar) + { + smData.hmenu = m_hmenu; + } + smData.pvUserData = NULL; + if (m_SFToolbar) + m_SFToolbar->GetShellFolder(NULL, &smData.pidlFolder, IID_PPV_ARG(IShellFolder, &smData.psf)); + HRESULT hr = m_psmc->CallbackSM(&smData, uMsg, wParam, lParam); + ILFree(smData.pidlFolder); + if (smData.psf) + smData.psf->Release(); + return hr; +} #endif 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] Mon Feb 17 18:38:31 2014 @@ -20,7 +20,7 @@ #include "precomp.h" -/* NOTE: The following constants may *NOT* be changed because +/* NOTE: The following constants *MUST NOT* be changed because they're hardcoded and need to be the exact values in order to get the start menu to work! */ #define IDM_PROGRAMS 504

1 0

[dquintana] 62231: [RSHELL] * CMenuBand: Improve the code structure. * Make the class selection better managed. Thanks Giannis. CORE-7881
by dquintana＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: dquintana Date: Mon Feb 17 17:16:55 2014 New Revision: 62231 URL: http://svn.reactos.org/svn/reactos?rev=62231&view=rev Log: [RSHELL] * CMenuBand: Improve the code structure. * Make the class selection better managed. Thanks Giannis. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/base/shell/rshell/precomp.h 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] Mon Feb 17 17:16:55 2014 @@ -54,6 +54,8 @@ HRESULT OnHotItemChange(const NMTBHOTITEM * hot); + HRESULT PopupSubMenu(UINT uItem, IShellMenu* childShellMenu); + static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); protected: @@ -955,6 +957,72 @@ return S_OK; } +HRESULT CMenuToolbarBase::PopupSubMenu(UINT uItem, IShellMenu* childShellMenu) +{ + RECT rc; + TBBUTTONINFO info = { 0 }; + info.cbSize = sizeof(TBBUTTONINFO); + info.dwMask = 0; + int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, (LPARAM) &info); + if (index < 0) + return E_FAIL; + if (!SendMessage(m_hwnd, TB_GETITEMRECT, index, (LPARAM) &rc)) + return E_FAIL; + + POINT a = { rc.left, rc.top }; + POINT b = { rc.right, rc.bottom }; + + ClientToScreen(m_hwnd, &a); + ClientToScreen(m_hwnd, &b); + + POINTL pt = { b.x, b.y }; + RECTL rcl = { a.x, a.y, b.x, b.y }; // maybe-TODO: fetch client area of deskbar? + + IBandSite* pBandSite; + IDeskBar* pDeskBar; + + HRESULT hr; + +#ifndef USE_BUILTIN_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(hr)) + return hr; + +#ifndef USE_BUILTIN_MENUDESKBAR + hr = CoCreateInstance(CLSID_MenuDeskBar, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IDeskBar, &pDeskBar)); +#else + hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); +#endif + if (FAILED(hr)) + return hr; + + hr = pDeskBar->SetClient(pBandSite); + if (FAILED(hr)) + return hr; + + hr = pBandSite->AddBand(childShellMenu); + if (FAILED(hr)) + return hr; + + CComPtr<IMenuPopup> popup; + hr = pDeskBar->QueryInterface(IID_PPV_ARG(IMenuPopup, &popup)); + if (FAILED(hr)) + return hr; + + popup->Popup(&pt, &rcl, MPPF_TOP | MPPF_RIGHT); + + return S_OK; +} + BOOL AllocAndGetMenuString(HMENU hMenu, UINT ItemIDByPosition, WCHAR** String) { @@ -1058,38 +1126,12 @@ HRESULT CMenuStaticToolbar::PopupItem(UINT uItem) { - RECT rc; - TBBUTTONINFO info = { 0 }; - info.cbSize = sizeof(TBBUTTONINFO); - info.dwMask = 0; - int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, (LPARAM) &info); - if (index < 0) - return E_FAIL; - if (!SendMessage(m_hwnd, TB_GETITEMRECT, index, (LPARAM) &rc)) - return E_FAIL; - - POINT a = { rc.left, rc.top }; - POINT b = { rc.right, rc.bottom }; - - ClientToScreen(m_hwnd, &a); - ClientToScreen(m_hwnd, &b); - - POINTL pt = { b.x, b.y }; - RECTL rcl = { a.x, a.y, b.x, b.y }; // maybe-TODO: fetch client area of deskbar? - CComPtr<IShellMenu> shellMenu; HRESULT hr = m_menuBand->CallCBWithId(uItem, SMC_GETOBJECT, (WPARAM) &IID_IShellMenu, (LPARAM) &shellMenu); if (FAILED(hr)) return hr; - CComPtr<IMenuPopup> popup; - hr = CSubMenu_Constructor(shellMenu, IID_PPV_ARG(IMenuPopup, &popup)); - if (FAILED(hr)) - return hr; - - popup->Popup(&pt, &rcl, MPPF_TOP | MPPF_RIGHT); - - return S_OK; + return PopupSubMenu(uItem, shellMenu); } HRESULT CMenuStaticToolbar::HasSubMenu(UINT uItem) 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] Mon Feb 17 17:16:55 2014 @@ -125,7 +125,7 @@ case IDM_DOCUMENTS: csidl = CSIDL_RECENT; break; } -#if 0 +#ifndef USE_BUILTIN_MENUBAND hr = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, @@ -262,7 +262,7 @@ IShellFolder *shellFolder; IShellFolder *psfStartMenu; -#if 0 +#ifndef USE_BUILTIN_MENUBAND hr = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, @@ -273,7 +273,7 @@ if (FAILED(hr)) return hr; -#if 0 +#ifndef USE_BUILTIN_MENUSITE hr = CoCreateInstance(CLSID_MenuBandSite, NULL, CLSCTX_INPROC_SERVER, @@ -284,7 +284,7 @@ if (FAILED(hr)) return hr; -#if 0 +#ifndef USE_BUILTIN_MENUDESKBAR hr = CoCreateInstance(CLSID_MenuDeskBar, NULL, CLSCTX_INPROC_SERVER, @@ -325,45 +325,3 @@ return pDeskBar->QueryInterface(riid, ppv); } - -extern "C" -HRESULT -CSubMenu_Constructor(IShellMenu * pShellMenu, REFIID riid, void **ppv) -{ - IBandSite* pBandSite; - IDeskBar* pDeskBar; - - HRESULT hr; - -#if 0 - 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(hr)) - return hr; - -#if 0 - hr = CoCreateInstance(CLSID_MenuDeskBar, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IDeskBar, &pDeskBar)); -#else - hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); -#endif - if (FAILED(hr)) - return hr; - - hr = pDeskBar->SetClient(pBandSite); - if (FAILED(hr)) - return hr; - - hr = pBandSite->AddBand(pShellMenu); - if (FAILED(hr)) - return hr; - - return pDeskBar->QueryInterface(riid, ppv); -} Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Mon Feb 17 17:16:55 2014 @@ -1,3 +1,7 @@ + +#define USE_BUILTIN_MENUDESKBAR +#define USE_BUILTIN_MENUSITE +#define USE_BUILTIN_MENUBAND #include <stdio.h> #include <tchar.h> @@ -33,4 +37,3 @@ extern "C" HRESULT CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); extern "C" HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv); extern "C" HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT CSubMenu_Constructor(IShellMenu * pShellMenu, REFIID riid, void **ppv);

1 0

[tfaber] 62230: [SHELL32] - Fix more casts and stack corruption
by tfaber＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: tfaber Date: Mon Feb 17 17:01:37 2014 New Revision: 62230 URL: http://svn.reactos.org/svn/reactos?rev=62230&view=rev Log: [SHELL32] - Fix more casts and stack corruption Modified: trunk/reactos/dll/win32/shell32/filedefext.cpp trunk/reactos/dll/win32/shell32/folders/fs.cpp trunk/reactos/dll/win32/shell32/folders/fs.h trunk/reactos/dll/win32/shell32/shellole.cpp Modified: trunk/reactos/dll/win32/shell32/filedefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… ============================================================================== --- trunk/reactos/dll/win32/shell32/filedefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/filedefext.cpp [iso-8859-1] Mon Feb 17 17:01:37 2014 @@ -979,7 +979,7 @@ DWORD WINAPI CFileDefExt::_CountFolderAndFilesThreadProc(LPVOID lpParameter) { - _CountFolderAndFilesData *data = reinterpret_cast<_CountFolderAndFilesData*>(lpParameter); + _CountFolderAndFilesData *data = static_cast<_CountFolderAndFilesData*>(lpParameter); DWORD ticks = 0; data->This->CountFolderAndFiles(data->hwndDlg, data->pwszBuf, data->cchBufMax, &ticks); Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Mon Feb 17 17:01:37 2014 @@ -1427,7 +1427,7 @@ { if (SUCCEEDED(pAsyncOperation->GetAsyncMode(&fIsOpAsync)) && fIsOpAsync) { - _DoDropData *data = reinterpret_cast<_DoDropData*> (HeapAlloc(GetProcessHeap(), 0, sizeof(_DoDropData))); + _DoDropData *data = static_cast<_DoDropData*>(HeapAlloc(GetProcessHeap(), 0, sizeof(_DoDropData))); data->This = this; // Need to maintain this class in case the window is closed or the class exists temporarily (when dropping onto a folder). this->AddRef(); @@ -1439,7 +1439,7 @@ data->pdwEffect = *pdwEffect; data->pDataObject->AddRef(); data->pAsyncOperation->StartOperation(NULL); - SHCreateThread(reinterpret_cast<LPTHREAD_START_ROUTINE> (CFSFolder::_DoDropThreadProc), reinterpret_cast<void *> (data), NULL, NULL); + SHCreateThread(CFSFolder::_DoDropThreadProc, data, NULL, NULL); return S_OK; } else @@ -1737,8 +1737,8 @@ return hr; } -DWORD CFSFolder::_DoDropThreadProc(LPVOID lpParameter) { - _DoDropData *data = reinterpret_cast<_DoDropData*>(lpParameter); +DWORD WINAPI CFSFolder::_DoDropThreadProc(LPVOID lpParameter) { + _DoDropData *data = static_cast<_DoDropData*>(lpParameter); HRESULT hr = data->This->_DoDrop(data->pDataObject, data->dwKeyState, data->pt, &data->pdwEffect); //Release the CFSFolder and data object holds in the copying thread. data->pAsyncOperation->EndOperation(hr, NULL, data->pdwEffect); Modified: trunk/reactos/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] Mon Feb 17 17:01:37 2014 @@ -46,7 +46,7 @@ BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); void SF_RegisterClipFmt(); BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); - static DWORD _DoDropThreadProc(LPVOID lpParameter); + static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); public: Modified: trunk/reactos/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] Mon Feb 17 17:01:37 2014 @@ -600,7 +600,7 @@ case CREATE_ALWAYS: if (SUCCEEDED(hres)) { - reinterpret_cast<IPropertyStorage*>(*ppstg)->Release(); + (*ppstg)->Release(); hres = psstg->Delete(fmtid); if(FAILED(hres)) return hres; @@ -620,7 +620,7 @@ { prop.ulKind = PRSPEC_PROPID; prop.propid = PID_CODEPAGE; - hres = reinterpret_cast<IPropertyStorage*>(*ppstg)->ReadMultiple(1, &prop, &ret); + hres = (*ppstg)->ReadMultiple(1, &prop, &ret); if (FAILED(hres) || ret.vt!=VT_I2) *puCodePage = 0; else

1 0

[tfaber] 62229: [SHELL32] - Fix some broken casts & stack corruption
by tfaber＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: tfaber Date: Mon Feb 17 16:53:41 2014 New Revision: 62229 URL: http://svn.reactos.org/svn/reactos?rev=62229&view=rev Log: [SHELL32] - Fix some broken casts & stack corruption Modified: trunk/reactos/dll/win32/shell32/filedefext.cpp trunk/reactos/dll/win32/shell32/filedefext.h Modified: trunk/reactos/dll/win32/shell32/filedefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… ============================================================================== --- trunk/reactos/dll/win32/shell32/filedefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/filedefext.cpp [iso-8859-1] Mon Feb 17 16:53:41 2014 @@ -95,7 +95,7 @@ return pwszResult; } - + VS_FIXEDFILEINFO *CFileVersionInfo::GetFixedInfo() { if (!m_pInfo) @@ -532,15 +532,15 @@ { /* For directories files have to be counted */ - _CountFolderAndFilesData *data = reinterpret_cast<_CountFolderAndFilesData*> (HeapAlloc(GetProcessHeap(), 0, sizeof(_CountFolderAndFilesData))); + _CountFolderAndFilesData *data = static_cast<_CountFolderAndFilesData*>(HeapAlloc(GetProcessHeap(), 0, sizeof(_CountFolderAndFilesData))); data->This = this; - data->pwszBuf = reinterpret_cast<LPWSTR> (HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * MAX_PATH)); + data->pwszBuf = static_cast<LPWSTR>(HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * MAX_PATH)); data->cchBufMax = MAX_PATH; data->hwndDlg = hwndDlg; this->AddRef(); StringCchCopyW(data->pwszBuf, MAX_PATH, m_wszPath); - - SHCreateThread(reinterpret_cast<LPTHREAD_START_ROUTINE> (CFileDefExt::_CountFolderAndFilesThreadProc), reinterpret_cast<LPVOID> (data), NULL, NULL); + + SHCreateThread(CFileDefExt::_CountFolderAndFilesThreadProc, data, NULL, NULL); /* Update size field */ if (SH_FormatFileSizeWithBytes(&m_DirSize, wszBuf, _countof(wszBuf))) @@ -683,7 +683,7 @@ if (!MoveFileW(pFileDefExt->m_wszPath, wszBuf)) ERR("MoveFileW failed\n"); } - + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; } @@ -866,7 +866,7 @@ CFileDefExt::~CFileDefExt() { - + } HRESULT WINAPI @@ -976,7 +976,7 @@ return E_NOTIMPL; } -DWORD +DWORD WINAPI CFileDefExt::_CountFolderAndFilesThreadProc(LPVOID lpParameter) { _CountFolderAndFilesData *data = reinterpret_cast<_CountFolderAndFilesData*>(lpParameter); Modified: trunk/reactos/dll/win32/shell32/filedefext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… ============================================================================== --- trunk/reactos/dll/win32/shell32/filedefext.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/filedefext.h [iso-8859-1] Mon Feb 17 16:53:41 2014 @@ -83,7 +83,7 @@ DWORD m_cFolders; ULARGE_INTEGER m_DirSize; - static DWORD _CountFolderAndFilesThreadProc(LPVOID lpParameter); + static DWORD WINAPI _CountFolderAndFilesThreadProc(LPVOID lpParameter); public: CFileDefExt();

1 0

[dquintana] 62228: [RSHELL] * CMenuBand: Implement PopupItem for static menus. * CMenuDeskBar: Initialize m_Banner. * CStartMenu: Create CSubMenu_Constructor function that creates submenus (needs a...
by dquintana＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: dquintana Date: Mon Feb 17 16:41:10 2014 New Revision: 62228 URL: http://svn.reactos.org/svn/reactos?rev=62228&view=rev Log: [RSHELL] * CMenuBand: Implement PopupItem for static menus. * CMenuDeskBar: Initialize m_Banner. * CStartMenu: Create CSubMenu_Constructor function that creates submenus (needs a better name/location). * Misc. code style changes. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/base/shell/rshell/wraplog.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] Mon Feb 17 16:41:10 2014 @@ -44,7 +44,7 @@ HRESULT GetWindow(HWND *phwnd); HRESULT ShowWindow(BOOL fShow); HRESULT Close(); - + BOOL IsWindowOwner(HWND hwnd) { return m_hwnd && m_hwnd == hwnd; } virtual HRESULT FillToolbar() = 0; @@ -897,7 +897,7 @@ } SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this); - m_SubclassOld = (WNDPROC)SetWindowLongPtr(m_hwnd, GWLP_WNDPROC, (LONG_PTR)CMenuToolbarBase::s_SubclassProc); + m_SubclassOld = (WNDPROC) SetWindowLongPtr(m_hwnd, GWLP_WNDPROC, (LONG_PTR) CMenuToolbarBase::s_SubclassProc); return S_OK; } @@ -1030,7 +1030,7 @@ tbb.fsStyle |= BTNS_WHOLEDROPDOWN; tbb.iString = (INT_PTR) MenuString; tbb.idCommand = info.wID; - + SMINFO sminfo; if (info.wID >= 0 && SUCCEEDED(m_menuBand->CallCBWithId(info.wID, SMC_GETINFO, 0, (LPARAM) &sminfo))) { @@ -1067,10 +1067,27 @@ return E_FAIL; if (!SendMessage(m_hwnd, TB_GETITEMRECT, index, (LPARAM) &rc)) return E_FAIL; - int px = rc.right; - int py = rc.bottom; - - // TODO: Create popup CMenuDeskBar + + POINT a = { rc.left, rc.top }; + POINT b = { rc.right, rc.bottom }; + + ClientToScreen(m_hwnd, &a); + ClientToScreen(m_hwnd, &b); + + POINTL pt = { b.x, b.y }; + RECTL rcl = { a.x, a.y, b.x, b.y }; // maybe-TODO: fetch client area of deskbar? + + CComPtr<IShellMenu> shellMenu; + HRESULT hr = m_menuBand->CallCBWithId(uItem, SMC_GETOBJECT, (WPARAM) &IID_IShellMenu, (LPARAM) &shellMenu); + if (FAILED(hr)) + return hr; + + CComPtr<IMenuPopup> popup; + hr = CSubMenu_Constructor(shellMenu, IID_PPV_ARG(IMenuPopup, &popup)); + if (FAILED(hr)) + return hr; + + popup->Popup(&pt, &rcl, MPPF_TOP | MPPF_RIGHT); return S_OK; } @@ -1179,7 +1196,7 @@ } HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { -// return m_menuBand->CallCBWithPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); + // TODO: return m_menuBand->CallCBWithPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); return S_OK; } @@ -1951,5 +1968,4 @@ smData.psf->Release(); return hr; } - #endif 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] Mon Feb 17 16:41:10 2014 @@ -446,7 +446,8 @@ m_Vertical(true), m_Visible(false), m_NeededSize(200), - m_Tracking(false) + m_Tracking(false), + m_Banner(NULL) { } 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] Mon Feb 17 16:41:10 2014 @@ -125,10 +125,14 @@ case IDM_DOCUMENTS: csidl = CSIDL_RECENT; break; } +#if 0 hr = CoCreateInstance(CLSID_MenuBand, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu,&pShellMenu)); + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellMenu, &pShellMenu)); +#else + hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); +#endif hr = pShellMenu->Initialize(this, 0, ANCESTORDEFAULT, SMINIT_VERTICAL); @@ -252,7 +256,6 @@ IShellMenu* pShellMenu; IBandSite* pBandSite; IDeskBar* pDeskBar; - IShellMenuCallback* callback; LPITEMIDLIST pidlStartMenu; HRESULT hr; @@ -268,7 +271,7 @@ hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); #endif if (FAILED(hr)) - return NULL; + return hr; #if 0 hr = CoCreateInstance(CLSID_MenuBandSite, @@ -279,7 +282,7 @@ hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite)); #endif if (FAILED(hr)) - return NULL; + return hr; #if 0 hr = CoCreateInstance(CLSID_MenuDeskBar, @@ -290,23 +293,18 @@ hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); #endif if (FAILED(hr)) - return NULL; + return hr; CComObject<CShellMenuCallback> *pCallback; hr = CComObject<CShellMenuCallback>::CreateInstance(&pCallback); if (FAILED(hr)) - return FALSE; + return hr; pCallback->AddRef(); // CreateInstance returns object with 0 ref count */ pCallback->Initialize(pShellMenu, pBandSite, pDeskBar); - callback = pCallback; - - hr = CShellMenuCallback::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellMenuCallback, &callback)); - if (FAILED(hr)) - return NULL; pShellMenu->Initialize(pCallback, -1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL); if (FAILED(hr)) - return NULL; + return hr; /* FIXME: Use CLSID_MergedFolder class and IID_IAugmentedShellFolder2 interface here */ /* CLSID_MergedFolder 26fdc864-be88-46e7-9235-032d8ea5162e */ @@ -319,11 +317,53 @@ hr = pDeskBar->SetClient(pBandSite); if (FAILED(hr)) - return NULL; + return hr; hr = pBandSite->AddBand(pShellMenu); if (FAILED(hr)) - return NULL; + return hr; return pDeskBar->QueryInterface(riid, ppv); } + +extern "C" +HRESULT +CSubMenu_Constructor(IShellMenu * pShellMenu, REFIID riid, void **ppv) +{ + IBandSite* pBandSite; + IDeskBar* pDeskBar; + + HRESULT hr; + +#if 0 + 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(hr)) + return hr; + +#if 0 + hr = CoCreateInstance(CLSID_MenuDeskBar, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IDeskBar, &pDeskBar)); +#else + hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); +#endif + if (FAILED(hr)) + return hr; + + hr = pDeskBar->SetClient(pBandSite); + if (FAILED(hr)) + return hr; + + hr = pBandSite->AddBand(pShellMenu); + if (FAILED(hr)) + return hr; + + return pDeskBar->QueryInterface(riid, ppv); +} Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Mon Feb 17 16:41:10 2014 @@ -32,4 +32,5 @@ extern "C" HRESULT CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); extern "C" HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv); +extern "C" HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv); +extern "C" HRESULT CSubMenu_Constructor(IShellMenu * pShellMenu, REFIID riid, void **ppv); Modified: branches/shell-experiments/base/shell/rshell/wraplog.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/wraplog.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/wraplog.cpp [iso-8859-1] Mon Feb 17 16:41:10 2014 @@ -2,11 +2,11 @@ #include "wraplog.h" #include <stdio.h> -static UINT openCount = 0; -static UINT callLevel; +static INT openCount = 0; +static INT callLevel; static FILE*log; -static UINT nTemps; +static INT nTemps; static CHAR strTemp[10][256]; void WrapLogOpen()

1 0

[dquintana] 62227: [RSHELL] * CMenuDeskBar: Use the proper value for style in AdjustWindowRect. * CMenuBand: Implement submenu hot-tracking timer. Not functional yet (submenu creation not implement...
by dquintana＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: dquintana Date: Mon Feb 17 15:38:55 2014 New Revision: 62227 URL: http://svn.reactos.org/svn/reactos?rev=62227&view=rev Log: [RSHELL] * CMenuDeskBar: Use the proper value for style in AdjustWindowRect. * CMenuBand: Implement submenu hot-tracking timer. Not functional yet (submenu creation not implemented). CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.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] Mon Feb 17 15:38:55 2014 @@ -19,10 +19,16 @@ */ #include "precomp.h" #include "wraplog.h" +#include <windowsx.h> WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); #define WRAP_LOG 0 + +#define TBSTYLE_EX_VERTICAL 4 + +#define TIMERID_HOTTRACK 1 +#define SUBCLASS_ID_MENUBAND 1 extern "C" BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); @@ -38,17 +44,28 @@ HRESULT GetWindow(HWND *phwnd); HRESULT ShowWindow(BOOL fShow); HRESULT Close(); + + BOOL IsWindowOwner(HWND hwnd) { return m_hwnd && m_hwnd == hwnd; } virtual HRESULT FillToolbar() = 0; + virtual HRESULT PopupItem(UINT uItem) = 0; + virtual HRESULT HasSubMenu(UINT uItem) = 0; virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) = 0; + HRESULT OnHotItemChange(const NMTBHOTITEM * hot); + + static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); protected: static const UINT WM_USER_SHOWPOPUPMENU = WM_USER + 1; + + LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); CMenuBand *m_menuBand; HWND m_hwnd; DWORD m_dwMenuFlags; + UINT m_hotItem; + WNDPROC m_SubclassOld; }; class CMenuStaticToolbar : public CMenuToolbarBase @@ -61,6 +78,8 @@ HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); virtual HRESULT FillToolbar(); + virtual HRESULT PopupItem(UINT uItem); + virtual HRESULT HasSubMenu(UINT uItem); virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); private: HMENU m_hmenu; @@ -76,6 +95,8 @@ HRESULT GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); virtual HRESULT FillToolbar(); + virtual HRESULT PopupItem(UINT uItem); + virtual HRESULT HasSubMenu(UINT uItem); virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); @@ -786,10 +807,6 @@ } #else -#include <windowsx.h> - -#define TBSTYLE_EX_VERTICAL 4 - CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand) : m_menuBand(menuBand), m_hwnd(NULL), @@ -879,6 +896,9 @@ SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, (LPARAM) ilSmall); } + SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this); + m_SubclassOld = (WNDPROC)SetWindowLongPtr(m_hwnd, GWLP_WNDPROC, (LONG_PTR)CMenuToolbarBase::s_SubclassProc); + return S_OK; } @@ -888,6 +908,49 @@ return E_FAIL; *phwnd = m_hwnd; + + return S_OK; +} + +LRESULT CALLBACK CMenuToolbarBase::s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + CMenuToolbarBase * pthis = (CMenuToolbarBase *) GetWindowLongPtr(hWnd, GWLP_USERDATA); + return pthis->SubclassProc(hWnd, uMsg, wParam, lParam); +} + +LRESULT CMenuToolbarBase::SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_TIMER: + if (wParam == TIMERID_HOTTRACK) + { + PopupItem(m_hotItem); + KillTimer(hWnd, TIMERID_HOTTRACK); + } + } + + return m_SubclassOld(hWnd, uMsg, wParam, lParam); +} + +HRESULT CMenuToolbarBase::OnHotItemChange(const NMTBHOTITEM * hot) +{ + if (hot->dwFlags & HICF_LEAVING) + { + KillTimer(m_hwnd, TIMERID_HOTTRACK); + } + else if (m_hotItem != hot->idNew) + { + if (HasSubMenu(hot->idNew) == S_OK) + { + DWORD elapsed; + SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0); + + m_hotItem = hot->idNew; + + SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL); + } + } return S_OK; } @@ -964,8 +1027,8 @@ if (!AllocAndGetMenuString(m_hmenu, i, &MenuString)) return E_OUTOFMEMORY; if (::GetSubMenu(m_hmenu, i) != NULL) - tbb.fsStyle |= BTNS_DROPDOWN; - tbb.iString = (INT_PTR) MenuString; + tbb.fsStyle |= BTNS_WHOLEDROPDOWN; + tbb.iString = (INT_PTR) MenuString; tbb.idCommand = info.wID; SMINFO sminfo; @@ -988,6 +1051,41 @@ return S_OK; } +HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + return m_menuBand->CallCBWithId(wParam, SMC_EXEC, 0, 0); +} + +HRESULT CMenuStaticToolbar::PopupItem(UINT uItem) +{ + RECT rc; + TBBUTTONINFO info = { 0 }; + info.cbSize = sizeof(TBBUTTONINFO); + info.dwMask = 0; + int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, (LPARAM) &info); + if (index < 0) + return E_FAIL; + if (!SendMessage(m_hwnd, TB_GETITEMRECT, index, (LPARAM) &rc)) + return E_FAIL; + int px = rc.right; + int py = rc.bottom; + + // TODO: Create popup CMenuDeskBar + + return S_OK; +} + +HRESULT CMenuStaticToolbar::HasSubMenu(UINT uItem) +{ + TBBUTTONINFO info = { 0 }; + info.cbSize = sizeof(TBBUTTONINFO); + info.dwMask = 0; + int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, (LPARAM) &info); + if (index < 0) + return E_FAIL; + return ::GetSubMenu(m_hmenu, index) ? S_OK : S_FALSE; +} + CMenuSFToolbar::CMenuSFToolbar(CMenuBand * menuBand) : CMenuToolbarBase(menuBand), m_shellFolder(NULL) @@ -1079,15 +1177,20 @@ return hr; } - -HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) -{ - return m_menuBand->CallCBWithId(wParam, SMC_EXEC, 0, 0); -} HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { // return m_menuBand->CallCBWithPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); return S_OK; +} + +HRESULT CMenuSFToolbar::PopupItem(UINT uItem) +{ + return S_OK; +} + +HRESULT CMenuSFToolbar::HasSubMenu(UINT uItem) +{ + return S_FALSE; // GetSubMenu(m_hmenu, uItem) ? S_OK : S_FALSE; } CMenuBand::CMenuBand() : @@ -1370,7 +1473,7 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETMAXSIZE, 0, (LPARAM) &sizeStatic); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETMAXSIZE, 0, (LPARAM) &sizeShlFld); - pdbi->ptMaxSize.x = sizeStatic.cx + sizeShlFld.cx; // ignored + pdbi->ptMaxSize.x = max(sizeStatic.cx, sizeShlFld.cx); // ignored pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy; } if (pdbi->dwMask & DBIM_INTEGRAL) @@ -1385,7 +1488,7 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, FALSE, (LPARAM) &sizeStatic); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, FALSE, (LPARAM) &sizeShlFld); - pdbi->ptActual.x = sizeStatic.cx + sizeShlFld.cx; + pdbi->ptActual.x = max(sizeStatic.cx, sizeShlFld.cx); if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, (LPARAM) &sizeStatic); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, (LPARAM) &sizeShlFld); @@ -1628,41 +1731,44 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - HWND hwndStatic = NULL; - HWND hwndShlFld = NULL; - HRESULT hr; - *theResult = 0; switch (uMsg) { case WM_COMMAND: - if (m_staticToolbar != NULL) - hr = m_staticToolbar->GetWindow(&hwndStatic); - if (FAILED(hr)) - return hr; - - if (hWnd == hwndStatic) + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) { return m_staticToolbar->OnCommand(wParam, lParam, theResult); } - if (m_SFToolbar != NULL) - hr = m_SFToolbar->GetWindow(&hwndShlFld); - if (FAILED(hr)) - return hr; - - if (hWnd == hwndShlFld) + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) { return m_SFToolbar->OnCommand(wParam, lParam, theResult); } return S_OK; + case WM_NOTIFY: NMHDR * hdr = (LPNMHDR) lParam; NMTBCUSTOMDRAW * cdraw; + NMTBHOTITEM * hot; switch (hdr->code) { + case TBN_HOTITEMCHANGE: + hot = (NMTBHOTITEM*) hdr; + + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) + { + return m_staticToolbar->OnHotItemChange(hot); + } + + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) + { + return m_SFToolbar->OnHotItemChange(hot); + } + + return S_OK; + case NM_CUSTOMDRAW: cdraw = (LPNMTBCUSTOMDRAW) hdr; switch (cdraw->nmcd.dwDrawStage) @@ -1697,7 +1803,7 @@ break; } - *theResult = TBCDRF_NOBACKGROUND | TBCDRF_NOEDGES | TBCDRF_NOETCHEDEFFECT | TBCDRF_HILITEHOTTRACK; + *theResult = TBCDRF_NOBACKGROUND | TBCDRF_NOEDGES | TBCDRF_NOETCHEDEFFECT | TBCDRF_HILITEHOTTRACK | TBCDRF_NOOFFSET; return S_OK; } return S_OK; @@ -1710,24 +1816,10 @@ HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd) { - HWND hwndStatic = NULL; - HWND hwndShlFld = NULL; - HRESULT hr; - - if (m_staticToolbar != NULL) - hr = m_staticToolbar->GetWindow(&hwndStatic); - if (FAILED(hr)) - return hr; - - if (hWnd == hwndStatic) + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) return S_OK; - if (m_SFToolbar != NULL) - hr = m_SFToolbar->GetWindow(&hwndShlFld); - if (FAILED(hr)) - return hr; - - if (hWnd == hwndShlFld) + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) return S_OK; return S_FALSE; 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] Mon Feb 17 15:38:55 2014 @@ -754,7 +754,7 @@ if (FAILED(hr)) return hr; - ::AdjustWindowRect(&rc, WS_DLGFRAME, FALSE); + ::AdjustWindowRect(&rc, ::GetWindowLong(m_hWnd, GWL_STYLE), FALSE); rc.right -= rc.left; rc.bottom -= rc.top;

1 0

[dquintana] 62226: [RSHELL] * CMenuBand: Handle WM_COMMAND and run SMC_EXEC for static menu items (Run, Shutdown). CORE-7881
by dquintana＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: dquintana Date: Mon Feb 17 11:20:35 2014 New Revision: 62226 URL: http://svn.reactos.org/svn/reactos?rev=62226&view=rev Log: [RSHELL] * CMenuBand: Handle WM_COMMAND and run SMC_EXEC for static menu items (Run, Shutdown). CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.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] Mon Feb 17 11:20:35 2014 @@ -40,6 +40,7 @@ HRESULT Close(); virtual HRESULT FillToolbar() = 0; + virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) = 0; protected: @@ -60,7 +61,7 @@ HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); virtual HRESULT FillToolbar(); - + virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); private: HMENU m_hmenu; }; @@ -75,6 +76,8 @@ HRESULT GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); virtual HRESULT FillToolbar(); + virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); + private: @@ -825,7 +828,7 @@ LONG tbStyles = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE | CCS_TOP; - LONG tbExStyles = TBSTYLE_EX_DOUBLEBUFFER | TBSTYLE_EX_DRAWDDARROWS; + LONG tbExStyles = TBSTYLE_EX_DOUBLEBUFFER; if (dwFlags & SMINIT_VERTICAL) { @@ -960,7 +963,8 @@ { if (!AllocAndGetMenuString(m_hmenu, i, &MenuString)) return E_OUTOFMEMORY; - tbb.fsStyle |= BTNS_DROPDOWN; + if (::GetSubMenu(m_hmenu, i) != NULL) + tbb.fsStyle |= BTNS_DROPDOWN; tbb.iString = (INT_PTR) MenuString; tbb.idCommand = info.wID; @@ -1076,6 +1080,16 @@ return hr; } +HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + return m_menuBand->CallCBWithId(wParam, SMC_EXEC, 0, 0); +} +HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ +// return m_menuBand->CallCBWithPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); + return S_OK; +} + CMenuBand::CMenuBand() : m_site(NULL), m_psmc(NULL), @@ -1614,9 +1628,37 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { + HWND hwndStatic = NULL; + HWND hwndShlFld = NULL; + HRESULT hr; + *theResult = 0; - if (uMsg == WM_NOTIFY) - { + switch (uMsg) + { + case WM_COMMAND: + + if (m_staticToolbar != NULL) + hr = m_staticToolbar->GetWindow(&hwndStatic); + if (FAILED(hr)) + return hr; + + if (hWnd == hwndStatic) + { + return m_staticToolbar->OnCommand(wParam, lParam, theResult); + } + + if (m_SFToolbar != NULL) + hr = m_SFToolbar->GetWindow(&hwndShlFld); + if (FAILED(hr)) + return hr; + + if (hWnd == hwndShlFld) + { + return m_SFToolbar->OnCommand(wParam, lParam, theResult); + } + + return S_OK; + case WM_NOTIFY: NMHDR * hdr = (LPNMHDR) lParam; NMTBCUSTOMDRAW * cdraw; switch (hdr->code) @@ -1661,8 +1703,8 @@ return S_OK; } return S_OK; - - } + } + return S_FALSE; }

1 0

[gadamopoulos] 62225: [RSHELL] - CMenuDeskBar: Implement showing a shadow. Implement closing the menu when it loses focus (this only works with the stock menu band for now)
by gadamopoulos＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: gadamopoulos Date: Mon Feb 17 10:42:52 2014 New Revision: 62225 URL: http://svn.reactos.org/svn/reactos?rev=62225&view=rev Log: [RSHELL] - CMenuDeskBar: Implement showing a shadow. Implement closing the menu when it loses focus (this only works with the stock menu band for now) Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp 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] Mon Feb 17 10:42:52 2014 @@ -127,7 +127,7 @@ DECLARE_PROTECT_FINAL_CONSTRUCT() #if !WRAP_LOG - DECLARE_WND_CLASS_EX(_T("BaseBar"), 0, COLOR_3DFACE) + DECLARE_WND_CLASS_EX(_T("BaseBar"), CS_SAVEBITS | CS_DROPSHADOW, COLOR_3DFACE) BEGIN_MSG_MAP(CMenuDeskBar) MESSAGE_HANDLER(WM_SIZE, OnSize) @@ -777,11 +777,7 @@ BOOL bHandled; OnSize(WM_SIZE, 0, 0, bHandled); - hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); - if (FAILED(hr)) - return hr; - - io->UIActivateIO(TRUE, NULL); + UIActivateIO(TRUE, NULL); return S_OK; } @@ -832,6 +828,23 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect( DWORD dwSelectType) { + if (dwSelectType == MPOS_FULLCANCEL) + { + CComPtr<IDeskBarClient> dbc; + + HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); + if (FAILED(hr)) + return hr; + + hr = dbc->UIActivateDBC(FALSE); + if (FAILED(hr)) + return hr; + + SetWindowPos(m_hWnd, 0,0,0,0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + + UIActivateIO(FALSE, NULL); + } + return S_OK; }

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