Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[dquintana] 62242: [RSHELL] * CMenuBand: Fix display of icons for the static toolbar. * CMenuDeskBar: Fix positioning of the window not to cross the top edge. CORE-7881

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Feb 18 11:17:37 2014 New Revision: 62242 URL: http://svn.reactos.org/svn/reactos?rev=62242&view=rev Log: [RSHELL] * CMenuBand: Fix display of icons for the static toolbar. * CMenuDeskBar: Fix positioning of the window not to cross the top edge. 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] Tue Feb 18 11:17:37 2014 @@ -1130,7 +1130,8 @@ tbb.iString = (INT_PTR) MenuString; tbb.idCommand = info.wID; - SMINFO sminfo; + SMINFO sminfo = { 0 }; + sminfo.dwMask = SMIM_ICON; if (info.wID >= 0 && SUCCEEDED(m_menuBand->CallCBWithId(info.wID, SMC_GETINFO, 0, (LPARAM) &sminfo))) { tbb.iBitmap = sminfo.iIcon; 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 Feb 18 11:17:37 2014 @@ -134,7 +134,6 @@ MESSAGE_HANDLER(WM_NOTIFY, OnNotify) MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) - MESSAGE_HANDLER(WM_ACTIVATE, OnActivate) MESSAGE_HANDLER(WM_PAINT, OnPaint) END_MSG_MAP() @@ -143,7 +142,6 @@ LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnCancelMode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); #endif @@ -667,16 +665,6 @@ return 0; } -LRESULT CMenuDeskBar::OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - if (LOWORD(wParam) == WA_INACTIVE) - { - //DestroyWindow(); - //ShowWindow(SW_HIDE); - } - return 0; -} - LRESULT CMenuDeskBar::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { TRACE("OnPaint\n"); @@ -771,6 +759,13 @@ int cx = rc.right; int cy = rc.bottom; + if (y < 0) + { + y = 0; + } + + // if (y+cy > work area height) cy = work area height - y + this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW); // HACK: The bar needs to be notified of the size AFTER it is shown.

10 years, 10 months

[akhaldi] 62241: [CMAKE] * Set the default PCH value only if it's not already set.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 18 11:12:26 2014 New Revision: 62241 URL: http://svn.reactos.org/svn/reactos?rev=62241&view=rev Log: [CMAKE] * Set the default PCH value only if it's not already set. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=62241&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue Feb 18 11:12:26 2014 @@ -134,7 +134,7 @@ add_definitions(-D_WINKD_=1) endif() - if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") + if((NOT DEFINED PCH) AND (CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS")) set(PCH 1) else() set(PCH 0)

10 years, 10 months

[dquintana] 62240: [RSHELL] * CMenuBand: Fix submenu creation for shell folder menus. CORE-7881

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Feb 18 11:05:20 2014 New Revision: 62240 URL: http://svn.reactos.org/svn/reactos?rev=62240&view=rev Log: [RSHELL] * CMenuBand: Fix submenu creation for shell folder menus. 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] Tue Feb 18 11:05:20 2014 @@ -1333,9 +1333,43 @@ HRESULT CMenuSFToolbar::PopupItem(UINT uItem) { + HRESULT hr; + UINT uId; + UINT uIdAncestor; + DWORD flags; int index; + CComPtr<IShellMenuCallback> psmc; CComPtr<IShellMenu> shellMenu; - HRESULT hr = m_menuBand->CallCBWithPidl(GetPidlFromId(uItem, &index), SMC_GETOBJECT, (WPARAM) &IID_IShellMenu, (LPARAM) &shellMenu); + + LPITEMIDLIST pidl = GetPidlFromId(uItem, &index); + + if (!pidl) + return E_FAIL; + +#ifndef USE_BUILTIN_MENUBAND + hr = CoCreateInstance(CLSID_MenuBand, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellMenu, &pShellMenu)); +#else + hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &shellMenu)); +#endif + if (FAILED(hr)) + return hr; + + m_menuBand->GetMenuInfo(&psmc, &uId, &uIdAncestor, &flags); + + // FIXME: not sure waht to use as uId/uIdAncestor here + hr = shellMenu->Initialize(psmc, 0, uId, SMINIT_VERTICAL); + if (FAILED(hr)) + return hr; + + CComPtr<IShellFolder> childFolder; + hr = m_shellFolder->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &childFolder)); + if (FAILED(hr)) + return hr; + + hr = shellMenu->SetShellFolder(childFolder, NULL, NULL, 0); if (FAILED(hr)) return hr;

10 years, 10 months

[dquintana] 62239: [RSHELL] * Change C-style casts to static_cast where possible, and reinterpret_cast elsewhere. * Make coding style and formatting more consistent.

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Feb 18 10:26:50 2014 New Revision: 62239 URL: http://svn.reactos.org/svn/reactos?rev=62239&view=rev Log: [RSHELL] * Change C-style casts to static_cast where possible, and reinterpret_cast elsewhere. * Make coding style and formatting more consistent. Modified: branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp 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/CStartMenu.cpp Modified: branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] Tue Feb 18 10:26:50 2014 @@ -26,9 +26,9 @@ #define SHDESK_TAG 0x4b534544 -static const WCHAR szProgmanClassName[] = {'P','r','o','g','m','a','n'}; -static const WCHAR szProgmanWindowName[] = { - 'P','r','o','g','r','a','m',' ','M','a','n','a','g','e','r' +static const WCHAR szProgmanClassName [] = { 'P', 'r', 'o', 'g', 'm', 'a', 'n' }; +static const WCHAR szProgmanWindowName [] = { + 'P', 'r', 'o', 'g', 'r', 'a', 'm', ' ', 'M', 'a', 'n', 'a', 'g', 'e', 'r' }; class CDesktopBrowser : @@ -52,7 +52,7 @@ CDesktopBrowser(); ~CDesktopBrowser(); HRESULT Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx); - HWND FindDesktopListView (); + HWND FindDesktopListView(); BOOL CreateDeskWnd(); HWND DesktopGetWindowControl(IN UINT id); static LRESULT CALLBACK ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam); @@ -78,19 +78,19 @@ virtual HRESULT STDMETHODCALLTYPE SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags); // *** ICommDlgBrowser methods *** - virtual HRESULT STDMETHODCALLTYPE OnDefaultCommand (struct IShellView *ppshv); - virtual HRESULT STDMETHODCALLTYPE OnStateChange (struct IShellView *ppshv, ULONG uChange); - virtual HRESULT STDMETHODCALLTYPE IncludeObject (struct IShellView *ppshv, LPCITEMIDLIST pidl); + virtual HRESULT STDMETHODCALLTYPE OnDefaultCommand(struct IShellView *ppshv); + virtual HRESULT STDMETHODCALLTYPE OnStateChange(struct IShellView *ppshv, ULONG uChange); + virtual HRESULT STDMETHODCALLTYPE IncludeObject(struct IShellView *ppshv, LPCITEMIDLIST pidl); // *** IServiceProvider methods *** virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); -BEGIN_COM_MAP(CDesktopBrowser) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - COM_INTERFACE_ENTRY_IID(IID_IShellBrowser, IShellBrowser) - COM_INTERFACE_ENTRY_IID(IID_ICommDlgBrowser, ICommDlgBrowser) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) -END_COM_MAP() + BEGIN_COM_MAP(CDesktopBrowser) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + COM_INTERFACE_ENTRY_IID(IID_IShellBrowser, IShellBrowser) + COM_INTERFACE_ENTRY_IID(IID_ICommDlgBrowser, ICommDlgBrowser) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + END_COM_MAP() }; CDesktopBrowser::CDesktopBrowser() @@ -163,7 +163,7 @@ CComObject<CDesktopBrowser> *pThis; HRESULT hRet; - ShellDesk = (IShellDesktopTray *)lpCreateStruct->lpCreateParams; + ShellDesk = static_cast<IShellDesktopTray *>(lpCreateStruct->lpCreateParams); if (ShellDesk == NULL) { WARN("No IShellDesk interface provided!"); @@ -185,7 +185,7 @@ return pThis; } -HWND CDesktopBrowser::FindDesktopListView () +HWND CDesktopBrowser::FindDesktopListView() { return FindWindowExW(hWndShellView, NULL, WC_LISTVIEW, NULL); } @@ -202,8 +202,8 @@ } fs.ViewMode = FVM_ICON; - fs.fFlags = FWF_DESKTOP | FWF_NOCLIENTEDGE | FWF_NOSCROLL | FWF_TRANSPARENT; - hRet = DesktopView->CreateViewWindow(NULL, &fs, (IShellBrowser *)this, &rcClient, &hWndShellView); + fs.fFlags = FWF_DESKTOP | FWF_NOCLIENTEDGE | FWF_NOSCROLL | FWF_TRANSPARENT; + hRet = DesktopView->CreateViewWindow(NULL, &fs, static_cast<IShellBrowser *>(this), &rcClient, &hWndShellView); if (!SUCCEEDED(hRet)) return FALSE; @@ -265,7 +265,7 @@ return S_FALSE; } -typedef HRESULT (WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); +typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) { @@ -284,14 +284,14 @@ { switch (id) { - case FCW_TOOLBAR: - case FCW_STATUS: - case FCW_TREE: - case FCW_PROGRESS: - return NULL; - - default: - return NULL; + case FCW_TOOLBAR: + case FCW_STATUS: + case FCW_TREE: + case FCW_PROGRESS: + return NULL; + + default: + return NULL; } } @@ -321,10 +321,7 @@ hWnd = DesktopGetWindowControl(id); if (hWnd != NULL) { - *pret = SendMessageW(hWnd, - uMsg, - wParam, - lParam); + *pret = SendMessageW(hWnd, uMsg, wParam, lParam); return S_OK; } @@ -395,8 +392,7 @@ if (uMsg != WM_NCCREATE) { - pThis = (CDesktopBrowser*)GetWindowLongPtrW(hwnd, - 0); + pThis = reinterpret_cast<CDesktopBrowser*>(GetWindowLongPtrW(hwnd, 0)); if (pThis == NULL) goto DefMsgHandler; } @@ -405,86 +401,86 @@ { switch (uMsg) { - case WM_ERASEBKGND: - return (LRESULT)PaintDesktop((HDC)wParam); - - case WM_GETISHELLBROWSER: - Ret = (LRESULT)((IShellBrowser *)pThis); - break; - - case WM_SIZE: - if (wParam == SIZE_MINIMIZED) + case WM_ERASEBKGND: + return (LRESULT) PaintDesktop((HDC) wParam); + + case WM_GETISHELLBROWSER: + Ret = reinterpret_cast<LRESULT>(static_cast<IShellBrowser *>(pThis)); + break; + + case WM_SIZE: + if (wParam == SIZE_MINIMIZED) + { + /* Hey, we're the desktop!!! */ + ShowWindow(hwnd, + SW_RESTORE); + } + else + { + RECT rcDesktop; + + rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); + + /* FIXME: Update work area */ + } + break; + + case WM_SYSCOLORCHANGE: + case WM_SETTINGCHANGE: + { + if (uMsg == WM_SYSCOLORCHANGE || wParam == SPI_SETDESKWALLPAPER || wParam == 0) + { + if (pThis->hWndShellView != NULL) { - /* Hey, we're the desktop!!! */ - ShowWindow(hwnd, - SW_RESTORE); + /* Forward the message */ + SendMessageW(pThis->hWndShellView, + uMsg, + wParam, + lParam); } - else - { - RECT rcDesktop; - - rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN); - rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); - rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); - - /* FIXME: Update work area */ - } - break; - - case WM_SYSCOLORCHANGE: - case WM_SETTINGCHANGE: + } + break; + } + + case WM_CREATE: + { + pThis->ShellDesk->RegisterDesktopWindow(pThis->hWnd); + + if (!pThis->CreateDeskWnd()) + WARN("Could not create the desktop view control!\n"); + break; + } + + case WM_NCCREATE: + { + LPCREATESTRUCT CreateStruct = (LPCREATESTRUCT) lParam; + pThis = SHDESK_Create(hwnd, CreateStruct); + if (pThis == NULL) { - if (uMsg == WM_SYSCOLORCHANGE || wParam == SPI_SETDESKWALLPAPER || wParam == 0) - { - if (pThis->hWndShellView != NULL) - { - /* Forward the message */ - SendMessageW(pThis->hWndShellView, - uMsg, - wParam, - lParam); - } - } + WARN("Failed to create desktop structure\n"); break; } - case WM_CREATE: - { - pThis->ShellDesk->RegisterDesktopWindow(pThis->hWnd); - - if (!pThis->CreateDeskWnd()) - WARN("Could not create the desktop view control!\n"); - break; - } - - case WM_NCCREATE: - { - LPCREATESTRUCT CreateStruct = (LPCREATESTRUCT)lParam; - pThis = SHDESK_Create(hwnd, CreateStruct); - if (pThis == NULL) - { - WARN("Failed to create desktop structure\n"); - break; - } - - SetWindowLongPtrW(hwnd, - 0, - (LONG_PTR)pThis); - Ret = TRUE; - break; - } - - case WM_NCDESTROY: - { - pThis->Release(); - break; - } - - default: -DefMsgHandler: - Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); - break; + SetWindowLongPtrW(hwnd, + 0, + (LONG_PTR) pThis); + Ret = TRUE; + break; + } + + case WM_NCDESTROY: + { + pThis->Release(); + break; + } + + default: + DefMsgHandler : + Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); + break; } } @@ -503,7 +499,7 @@ wcProgman.hInstance = shell32_hInstance; wcProgman.hIcon = NULL; wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW); - wcProgman.hbrBackground = (HBRUSH)(COLOR_BACKGROUND + 1); + wcProgman.hbrBackground = (HBRUSH) (COLOR_BACKGROUND + 1); wcProgman.lpszMenuName = NULL; wcProgman.lpszClassName = szProgmanClassName; @@ -547,9 +543,9 @@ hWndDesk = CreateWindowExW(0, szProgmanClassName, szProgmanWindowName, WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, rcDesk.left, rcDesk.top, rcDesk.right, rcDesk.bottom, - NULL, NULL, shell32_hInstance, (LPVOID)ShellDesk); + NULL, NULL, shell32_hInstance, (LPVOID) ShellDesk); if (hWndDesk != NULL) - return (HANDLE)GetWindowLongPtrW(hWndDesk, 0); + return (HANDLE) GetWindowLongPtrW(hWndDesk, 0); return NULL; } @@ -560,7 +556,7 @@ */ BOOL WINAPI SHDesktopMessageLoop(HANDLE hDesktop) { - CDesktopBrowser *Desk = (CDesktopBrowser *)hDesktop; + CDesktopBrowser *Desk = reinterpret_cast<CDesktopBrowser *>(hDesktop); if (Desk == NULL || Desk->Tag != SHDESK_TAG) { 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 Feb 18 10:26:50 2014 @@ -56,6 +56,7 @@ HRESULT OnHotItemChange(const NMTBHOTITEM * hot); HRESULT PopupSubMenu(UINT index, IShellMenu* childShellMenu); + HRESULT DoContextMenu(IContextMenu* contextMenu); static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); protected: @@ -281,7 +282,7 @@ END_COM_MAP() private: - HRESULT _CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam); + HRESULT _CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam, UINT id = 0, LPITEMIDLIST pidl = NULL); }; extern "C" @@ -850,14 +851,14 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags) { LONG tbStyles = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | - TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | + TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_CUSTOMERASE | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE | CCS_TOP; LONG tbExStyles = TBSTYLE_EX_DOUBLEBUFFER; if (dwFlags & SMINIT_VERTICAL) { tbStyles |= CCS_VERT; - tbExStyles |= TBSTYLE_EX_VERTICAL; + tbExStyles |= TBSTYLE_EX_VERTICAL | WS_EX_TOOLWINDOW; } RECT rc; @@ -921,7 +922,7 @@ LRESULT CALLBACK CMenuToolbarBase::s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CMenuToolbarBase * pthis = (CMenuToolbarBase *) GetWindowLongPtr(hWnd, GWLP_USERDATA); + CMenuToolbarBase * pthis = reinterpret_cast<CMenuToolbarBase *>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); return pthis->SubclassProc(hWnd, uMsg, wParam, lParam); } @@ -1023,6 +1024,36 @@ return S_OK; } +HRESULT CMenuToolbarBase::DoContextMenu(IContextMenu* contextMenu) +{ + HRESULT hr; + HMENU hPopup = CreatePopupMenu(); + + if (hPopup == NULL) + return E_FAIL; + + hr = contextMenu->QueryContextMenu(hPopup, 0, 0, UINT_MAX, CMF_NORMAL); + if (FAILED(hr)) + { + DestroyMenu(hPopup); + return hr; + } + + DWORD dwPos = GetMessagePos(); + UINT uCommand = ::TrackPopupMenu(hPopup, TPM_RETURNCMD, GET_X_LPARAM(dwPos), GET_Y_LPARAM(dwPos), 0, m_hwnd, NULL); + if (uCommand == 0) + return S_FALSE; + + CMINVOKECOMMANDINFO cmi = { 0 }; + cmi.cbSize = sizeof(cmi); + cmi.lpVerb = MAKEINTRESOURCEA(uCommand); + cmi.hwnd = m_hwnd; + hr = contextMenu->InvokeCommand(&cmi); + + DestroyMenu(hPopup); + return hr; +} + BOOL AllocAndGetMenuString(HMENU hMenu, UINT ItemIDByPosition, WCHAR** String) { @@ -1095,7 +1126,7 @@ if (!AllocAndGetMenuString(m_hmenu, i, &MenuString)) return E_OUTOFMEMORY; if (::GetSubMenu(m_hmenu, i) != NULL) - tbb.fsStyle |= BTNS_WHOLEDROPDOWN; + tbb.fsStyle |= BTNS_DROPDOWN; tbb.iString = (INT_PTR) MenuString; tbb.idCommand = info.wID; @@ -1126,47 +1157,7 @@ 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; + return DoContextMenu(contextMenu); } HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) @@ -1246,7 +1237,7 @@ if (attrs != 0) { - tbb.fsStyle |= BTNS_WHOLEDROPDOWN; + tbb.fsStyle |= BTNS_DROPDOWN; } tbb.idCommand = i++; @@ -1319,59 +1310,20 @@ if (!SendMessage(m_hwnd, TB_GETBUTTON, index, (LPARAM) &btn)) return NULL; - return (LPITEMIDLIST)btn.dwData; + 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); + LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(rclick->dwItemData); + + hr = m_shellFolder->GetUIObjectOf(m_hwnd, 1, &pidl, IID_IContextMenu, NULL, reinterpret_cast<VOID **>(&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; + return DoContextMenu(contextMenu); } HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) @@ -1381,7 +1333,7 @@ HRESULT CMenuSFToolbar::PopupItem(UINT uItem) { - int index; + int index; CComPtr<IShellMenu> shellMenu; HRESULT hr = m_menuBand->CallCBWithPidl(GetPidlFromId(uItem, &index), SMC_GETOBJECT, (WPARAM) &IID_IShellMenu, (LPARAM) &shellMenu); if (FAILED(hr)) @@ -1581,8 +1533,6 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnPosRectChangeDB(RECT *prc) { - SIZE sizeStaticX = { 0 }; - SIZE sizeShlFldX = { 0 }; SIZE sizeStaticY = { 0 }; SIZE sizeShlFldY = { 0 }; HWND hwndStatic = NULL; @@ -1604,8 +1554,6 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, (LPARAM) &sizeStaticY); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, (LPARAM) &sizeShlFldY); - if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, FALSE, (LPARAM) &sizeStaticX); - if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, FALSE, (LPARAM) &sizeShlFldX); int sy = max(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy); @@ -1958,14 +1906,14 @@ return S_OK; case WM_NOTIFY: - NMHDR * hdr = (LPNMHDR) lParam; + NMHDR * hdr = reinterpret_cast<LPNMHDR>(lParam); NMTBCUSTOMDRAW * cdraw; NMTBHOTITEM * hot; NMMOUSE * rclick; switch (hdr->code) { case TBN_HOTITEMCHANGE: - hot = (NMTBHOTITEM*) hdr; + hot = reinterpret_cast<LPNMTBHOTITEM>(hdr); if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) { @@ -1980,7 +1928,7 @@ return S_OK; case NM_RCLICK: - rclick = (LPNMMOUSE) hdr; + rclick = reinterpret_cast<LPNMMOUSE>(hdr); if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) { @@ -1994,7 +1942,7 @@ return S_OK; case NM_CUSTOMDRAW: - cdraw = (LPNMTBCUSTOMDRAW) hdr; + cdraw = reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr); switch (cdraw->nmcd.dwDrawStage) { case CDDS_PREPAINT: @@ -2121,7 +2069,17 @@ return S_OK; } -HRESULT CMenuBand::CallCBWithId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam) +HRESULT CMenuBand::CallCBWithId(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return _CallCB(uMsg, wParam, lParam, id); +} + +HRESULT CMenuBand::CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return _CallCB(uMsg, wParam, lParam, 0, pidl); +} + +HRESULT CMenuBand::_CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam, UINT id, LPITEMIDLIST pidl) { if (!m_psmc) return S_FALSE; @@ -2130,11 +2088,12 @@ GetWindow(&hwnd); SMDATA smData = { 0 }; - smData.punk = (IShellMenu2*)this; - smData.uId = Id; + smData.punk = static_cast<IShellMenu2*>(this); + smData.uId = id; smData.uIdParent = m_uId; smData.uIdAncestor = m_uIdAncestor; smData.hwnd = hwnd; + smData.pidlItem = pidl; if (m_staticToolbar) { smData.hmenu = m_hmenu; @@ -2148,59 +2107,4 @@ smData.psf->Release(); return hr; } - -HRESULT CMenuBand::CallCBWithPidl(LPITEMIDLIST pidl, 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; - smData.pidlItem = pidl; - 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; -} - -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/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 Feb 18 10:26:50 2014 @@ -480,7 +480,7 @@ } HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, - OLECMD prgCmds[], OLECMDTEXT *pCmdText) + OLECMD prgCmds [], OLECMDTEXT *pCmdText) { return E_NOTIMPL; } @@ -512,7 +512,7 @@ if (m_Site == NULL) return E_FAIL; - if (IsEqualGUID(guidService,SID_SMenuPopup)) + if (IsEqualGUID(guidService, SID_SMenuPopup)) { return this->QueryInterface(riid, ppvObject); } @@ -633,7 +633,7 @@ ::GetObject(m_Banner, sizeof(bm), &bm); rc.left += bm.bmWidth; } - + ::SetWindowPos(clientWnd, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, 0); } @@ -703,10 +703,10 @@ TRACE("Painting banner: %d by %d\n", bm.bmWidth, bm.bmHeight); - if (!::StretchBlt(hdc, 0, 0, bx, cy-by, hdcMem, 0, 0, bx, 1, SRCCOPY)) + if (!::StretchBlt(hdc, 0, 0, bx, cy - by, hdcMem, 0, 0, bx, 1, SRCCOPY)) WARN("StretchBlt failed\n"); - if (!::BitBlt(hdc, 0, cy-by, bx, by, hdcMem, 0, 0, SRCCOPY)) + if (!::BitBlt(hdc, 0, cy - by, bx, by, hdcMem, 0, 0, SRCCOPY)) WARN("BitBlt failed\n"); ::SelectObject(hdcMem, hbmOld); @@ -754,7 +754,7 @@ hr = IUnknown_QueryServiceExec(m_Client, SID_SMenuBandChild, &CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL); if (FAILED(hr)) return hr; - + ::AdjustWindowRect(&rc, ::GetWindowLong(m_hWnd, GWL_STYLE), FALSE); rc.right -= rc.left; rc.bottom -= rc.top; @@ -812,7 +812,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetBitmap(THIS_ HBITMAP hBitmap) { m_Banner = hBitmap; - + BOOL bHandled; OnSize(WM_SIZE, 0, 0, bHandled); @@ -841,7 +841,7 @@ if (FAILED(hr)) return hr; - SetWindowPos(m_hWnd, 0,0,0,0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); UIActivateIO(FALSE, NULL); } 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 Feb 18 10:26:50 2014 @@ -58,7 +58,7 @@ CMenuSite(); ~CMenuSite() {} - DECLARE_WND_CLASS_EX(_T("MenuSite"), 0, COLOR_WINDOW) + DECLARE_WND_CLASS_EX(_T("MenuSite"), 0, COLOR_MENU) DECLARE_NOT_AGGREGATABLE(CMenuSite) DECLARE_PROTECT_FINAL_CONSTRUCT() @@ -88,7 +88,7 @@ virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); // IOleCommandTarget - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); virtual HRESULT STDMETHODCALLTYPE Exec(const GUID * pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); // IInputObject @@ -119,7 +119,7 @@ virtual HRESULT STDMETHODCALLTYPE SetModeDBC(DWORD dwMode); private: - IUnknown * ToIUnknown() { return (IDeskBarClient*)this; } + IUnknown * ToIUnknown() { return static_cast<IDeskBarClient*>(this); } }; extern "C" @@ -421,6 +421,7 @@ { RECT Rect = { 0 }; GetClientRect(&Rect); + Rect.right = Rect.right; pMenuPopup->OnPosRectChangeDB(&Rect); } } @@ -428,7 +429,7 @@ lResult = 1; break; case WM_NOTIFY: - hWndTarget = ((NMHDR *)lParam)->hwndFrom; + hWndTarget = reinterpret_cast<LPNMHDR>(lParam)->hwndFrom; break; case WM_COMMAND: hWndTarget = (HWND) lParam; 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 Feb 18 10:26:50 2014 @@ -52,12 +52,12 @@ * 4. showing the programs start menu is SLOW compared to windows. this needs some investigation */ -class CShellMenuCallback : +class CShellMenuCallback : public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellMenuCallback + public IShellMenuCallback { private: - + HWND m_hwndTray; CComPtr<IShellMenu> m_pShellMenu; CComPtr<IBandSite> m_pBandSite; @@ -87,7 +87,7 @@ HRESULT OnGetInfo(LPSMDATA psmd, SMINFO *psminfo) { int iconIndex = 0; - + switch (psmd->uId) { case IDM_PROGRAMS: iconIndex = -20; break; @@ -114,7 +114,7 @@ if (iconIndex) { if ((psminfo->dwMask & SMIM_ICON) != 0) - psminfo->iIcon = Shell_GetCachedImageIndex(L"shell32.dll", iconIndex, FALSE); + psminfo->iIcon = Shell_GetCachedImageIndex(L"shell32.dll", iconIndex, FALSE); #ifdef TEST_TRACKPOPUPMENU_SUBMENUS if ((psminfo->dwMask & SMIM_FLAGS) != 0) psminfo->dwFlags |= SMIF_TRACKPOPUP; @@ -128,7 +128,7 @@ HRESULT hr; int csidl = 0; IShellMenu *pShellMenu; - + switch (psmd->uId) { case IDM_PROGRAMS: csidl = CSIDL_PROGRAMS; break; @@ -163,7 +163,7 @@ MENUITEMINFO mii; mii.cbSize = sizeof(mii); mii.fMask = MIIM_SUBMENU; - if (GetMenuItemInfoW( psmd->hmenu, psmd->uId, FALSE, &mii)) + if (GetMenuItemInfoW(psmd->hmenu, psmd->uId, FALSE, &mii)) { hr = pShellMenu->SetMenu(mii.hSubMenu, NULL, SMSET_BOTTOM); } @@ -174,7 +174,7 @@ HRESULT OnGetContextMenu(LPSMDATA psmd, REFIID iid, void ** pv) { if (psmd->uId == IDM_PROGRAMS || - psmd->uId == IDM_CONTROLPANEL || + psmd->uId == IDM_CONTROLPANEL || psmd->uId == IDM_NETWORKCONNECTIONS || psmd->uId == IDM_PRINTERSANDFAXES) { @@ -186,9 +186,9 @@ HRESULT OnGetObject(LPSMDATA psmd, REFIID iid, void ** pv) { - if (IsEqualIID(iid , IID_IShellMenu)) + if (IsEqualIID(iid, IID_IShellMenu)) return OnGetSubMenu(psmd, iid, pv); - else if (IsEqualIID( iid, IID_IContextMenu)) + else if (IsEqualIID(iid, IID_IContextMenu)) return OnGetContextMenu(psmd, iid, pv); return S_FALSE; @@ -196,14 +196,14 @@ HRESULT OnExec(LPSMDATA psmd) { - if(psmd->uId == IDM_CONTROLPANEL) - ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", NULL,NULL, 1); - else if(psmd->uId == IDM_NETWORKCONNECTIONS) - ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", NULL,NULL, 1); - else if(psmd->uId == IDM_PRINTERSANDFAXES) - ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}", NULL,NULL, 1); + if (psmd->uId == IDM_CONTROLPANEL) + ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", NULL, NULL, 1); + else if (psmd->uId == IDM_NETWORKCONNECTIONS) + ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", NULL, NULL, 1); + else if (psmd->uId == IDM_PRINTERSANDFAXES) + ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}", NULL, NULL, 1); else - PostMessageW( m_hwndTray, WM_COMMAND, psmd->uId, 0); + PostMessageW(m_hwndTray, WM_COMMAND, psmd->uId, 0); return S_OK; } @@ -216,7 +216,7 @@ COM_INTERFACE_ENTRY_IID(IID_IShellMenuCallback, IShellMenuCallback) END_COM_MAP() - void Initialize( + void Initialize( IShellMenu* pShellMenu, IBandSite* pBandSite, IDeskBar* pDeskBar) @@ -242,27 +242,25 @@ switch (uMsg) { case SMC_INITMENU: - return OnInitMenu(); + return OnInitMenu(); case SMC_GETINFO: - return OnGetInfo(psmd, reinterpret_cast<SMINFO*>(lParam)); + return OnGetInfo(psmd, reinterpret_cast<SMINFO*>(lParam)); case SMC_GETOBJECT: - return OnGetObject(psmd, *reinterpret_cast<IID *>(wParam), reinterpret_cast<void **>(lParam)); + return OnGetObject(psmd, *reinterpret_cast<IID *>(wParam), reinterpret_cast<void **>(lParam)); case SMC_EXEC: - return OnExec(psmd); + return OnExec(psmd); case SMC_SFEXEC: - m_pTrayPriv->Execute(psmd->psf, psmd->pidlItem); - break; - } - - return S_FALSE; + m_pTrayPriv->Execute(psmd->psf, psmd->pidlItem); + break; + } + + return S_FALSE; } }; -extern "C" +extern "C" HRESULT -CStartMenu_Constructor( - REFIID riid, - void **ppv) +CStartMenu_Constructor(REFIID riid, void **ppv) { IShellMenu* pShellMenu; IBandSite* pBandSite; @@ -305,7 +303,7 @@ #endif if (FAILED(hr)) return hr; - + CComObject<CShellMenuCallback> *pCallback; hr = CComObject<CShellMenuCallback>::CreateInstance(&pCallback); if (FAILED(hr)) @@ -322,15 +320,15 @@ /* IID_IAugmentedShellFolder2 8db3b3f4-6cfe-11d1-8ae9-00c04fd918d0 */ hr = SHGetFolderLocation(NULL, CSIDL_STARTMENU, 0, 0, &pidlStartMenu); hr = SHGetDesktopFolder(&shellFolder); - hr = shellFolder->BindToObject(pidlStartMenu, NULL, IID_IShellFolder, (void**)&psfStartMenu); + hr = shellFolder->BindToObject(pidlStartMenu, NULL, IID_IShellFolder, (void**) &psfStartMenu); hr = pShellMenu->SetShellFolder(psfStartMenu, NULL, NULL, 0); - - hr = pDeskBar->SetClient(pBandSite); - if (FAILED(hr)) - return hr; - - hr = pBandSite->AddBand(pShellMenu); + + hr = pDeskBar->SetClient(pBandSite); + if (FAILED(hr)) + return hr; + + hr = pBandSite->AddBand(pShellMenu); if (FAILED(hr)) return hr;

10 years, 10 months

[gadamopoulos] 62238: [rshell] - CStartMenu: add a test flag that makes the start menu show its submenus using SMIF_TRACKPOPUP in order to show how CMenuBand can use TrackPopupMenu

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 18 09:18:16 2014 New Revision: 62238 URL: http://svn.reactos.org/svn/reactos?rev=62238&view=rev Log: [rshell] - CStartMenu: add a test flag that makes the start menu show its submenus using SMIF_TRACKPOPUP in order to show how CMenuBand can use TrackPopupMenu Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp 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 Feb 18 09:18:16 2014 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#define TEST_TRACKPOPUPMENU_SUBMENUS #include "precomp.h" @@ -47,6 +49,7 @@ * 1. append the start menu contents from all users * 2. implement the context menu for start menu entries (programs, control panel, network connetions, printers) * 3. filter out programs folder from the shell folder part of the start menu + * 4. showing the programs start menu is SLOW compared to windows. this needs some investigation */ class CShellMenuCallback : @@ -72,7 +75,11 @@ hr = IUnknown_GetSite(m_pDeskBar, IID_PPV_ARG(ITrayPriv, &m_pTrayPriv)); hr = IUnknown_GetWindow(m_pTrayPriv, &m_hwndTray); hr = m_pTrayPriv->AppendMenuW(&hmenu); +#ifndef TEST_TRACKPOPUPMENU_SUBMENUS hr = m_pShellMenu->SetMenu(hmenu, NULL, SMSET_BOTTOM); +#else + hr = m_pShellMenu->SetMenu(hmenu, m_hwndTray, SMSET_BOTTOM); +#endif return hr; } @@ -106,8 +113,12 @@ if (iconIndex) { - psminfo->dwMask = SMIM_ICON; - psminfo->iIcon = Shell_GetCachedImageIndex(L"shell32.dll", iconIndex, FALSE); + if ((psminfo->dwMask & SMIM_ICON) != 0) + psminfo->iIcon = Shell_GetCachedImageIndex(L"shell32.dll", iconIndex, FALSE); +#ifdef TEST_TRACKPOPUPMENU_SUBMENUS + if ((psminfo->dwMask & SMIM_FLAGS) != 0) + psminfo->dwFlags |= SMIF_TRACKPOPUP; +#endif } return S_OK; }

10 years, 10 months

[aandrejevic] 62237: [BASESRV] Implement BaseSrvGetVDMExitCode.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Feb 18 02:15:33 2014 New Revision: 62237 URL: http://svn.reactos.org/svn/reactos?rev=62237&view=rev Log: [BASESRV] Implement BaseSrvGetVDMExitCode. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c branches/ntvdm/subsystems/win/basesrv/vdm.h Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Tue Feb 18 02:15:33 2014 @@ -209,8 +209,52 @@ CSR_API(BaseSrvGetVDMExitCode) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PBASE_GET_VDM_EXIT_CODE GetVDMExitCodeRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.GetVDMExitCodeRequest; + PLIST_ENTRY i = NULL; + PVDM_CONSOLE_RECORD ConsoleRecord = NULL; + PVDM_DOS_RECORD DosRecord = NULL; + + /* Enter the critical section */ + RtlEnterCriticalSection(&DosCriticalSection); + + /* Get the console record */ + Status = BaseSrvGetConsoleRecord(GetVDMExitCodeRequest->ConsoleHandle, &ConsoleRecord); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Search for a DOS record that has the same parent process handle */ + for (i = ConsoleRecord->DosListHead.Flink; i != &ConsoleRecord->DosListHead; i = i->Flink) + { + DosRecord = CONTAINING_RECORD(i, VDM_DOS_RECORD, Entry); + if (DosRecord->ParentProcess == GetVDMExitCodeRequest->hParent) break; + } + + /* Check if no DOS record was found */ + if (i == &ConsoleRecord->DosListHead) + { + Status = STATUS_NOT_FOUND; + goto Cleanup; + } + + /* Check if this task is still running */ + if (DosRecord->State == VDM_READY) + { + GetVDMExitCodeRequest->ExitCode = STATUS_PENDING; + goto Cleanup; + } + + /* Return the exit code */ + GetVDMExitCodeRequest->ExitCode = DosRecord->ExitCode; + + /* Since this is a zombie task record, remove it */ + RemoveEntryList(&DosRecord->Entry); + RtlFreeHeap(BaseSrvHeap, 0, DosRecord); + +Cleanup: + /* Leave the critical section */ + RtlLeaveCriticalSection(&DosCriticalSection); + + return Status; } CSR_API(BaseSrvSetReenterCount) Modified: branches/ntvdm/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] Tue Feb 18 02:15:33 2014 @@ -27,6 +27,9 @@ typedef struct _VDM_DOS_RECORD { LIST_ENTRY Entry; + USHORT State; + ULONG ExitCode; + HANDLE ParentProcess; // TODO: Structure incomplete!!! } VDM_DOS_RECORD, *PVDM_DOS_RECORD;

10 years, 10 months

[hbelusca] 62236: [NTVDM]: Load a BIOS image in case its name is given in BiosInitialize.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Feb 17 22:50:41 2014 New Revision: 62236 URL: http://svn.reactos.org/svn/reactos?rev=62236&view=rev Log: [NTVDM]: Load a BIOS image in case its name is given in BiosInitialize. Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] Mon Feb 17 22:50:41 2014 @@ -10,6 +10,7 @@ #define NDEBUG +#include "emulator.h" #include "bios.h" /* PRIVATE VARIABLES **********************************************************/ @@ -24,8 +25,119 @@ IN HANDLE ConsoleInput, IN HANDLE ConsoleOutput) { - Bios32Loaded = Bios32Initialize(ConsoleInput, ConsoleOutput); - return Bios32Loaded; + if (BiosFileName) + { + BOOL Success; + HANDLE hBiosFile; + DWORD BiosSize; + + /* Open the BIOS file */ + SetLastError(0); // For debugging purposes + hBiosFile = CreateFileW(BiosFileName, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + DPRINT1("BIOS opening %s ; GetLastError() = %u\n", hBiosFile != INVALID_HANDLE_VALUE ? "succeeded" : "failed", GetLastError()); + + /* If we failed, bail out */ + if (hBiosFile == INVALID_HANDLE_VALUE) return FALSE; + + /* OK, we have a handle to the BIOS file */ + + /* + * Retrieve the size of the file. Since the size of the BIOS file + * should be at most 64kB, we just use GetFileSize. + */ + BiosSize = GetFileSize(hBiosFile, NULL); + if (BiosSize == INVALID_FILE_SIZE && GetLastError() != ERROR_SUCCESS) + { + /* We failed, return failure */ + + /* Close the BIOS file */ + CloseHandle(hBiosFile); + + return FALSE; + } + + DisplayMessage(L"First bytes at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" + L"3 last bytes at 0x%p: 0x%02x 0x%02x 0x%02x", + (PVOID)((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) + 1 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 1 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 2 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 3 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 4 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 5 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 6 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 7 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 8 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 9 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 0xa - BiosSize), + + (PVOID)((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) - 2), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 2), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 1), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 0)); + + /* Attempt to load the BIOS file into memory */ + SetLastError(0); // For debugging purposes + Success = ReadFile(hBiosFile, + (PVOID)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 1 - BiosSize), + /* (PVOID)((ULONG_PTR)BaseAddress + ROM_AREA_END + 1 - BiosSize) */ + BiosSize, + &BiosSize, + NULL); + DPRINT1("BIOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); + + /* Close the BIOS file */ + CloseHandle(hBiosFile); + + DisplayMessage(L"First bytes at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" + L"3 last bytes at 0x%p: 0x%02x 0x%02x 0x%02x", + (PVOID)((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) + 1 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 1 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 2 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 3 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 4 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 5 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 6 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 7 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 8 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 9 - BiosSize), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) + 0xa - BiosSize), + + (PVOID)((ULONG_PTR)TO_LINEAR(0xF000, 0xFFFF) - 2), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 2), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 1), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(0xF000, 0xFFFF) - 0)); + + DisplayMessage(L"POST at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x", + TO_LINEAR(getCS(), getIP()), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(getCS(), getIP()) + 0), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(getCS(), getIP()) + 1), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(getCS(), getIP()) + 2), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(getCS(), getIP()) + 3), + *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(getCS(), getIP()) + 4)); + + /* Boot it up */ + + /* + * The CPU is already in reset-mode so that + * CS:IP points to F000:FFF0 as required. + */ + DisplayMessage(L"CS=0x%p ; IP=0x%p", getCS(), getIP()); + // setCS(0xF000); + // setIP(0xFFF0); + + return TRUE; + } + else + { + Bios32Loaded = Bios32Initialize(ConsoleInput, ConsoleOutput); + return Bios32Loaded; + } } VOID BiosCleanup(VOID)

10 years, 10 months

[hbelusca] 62235: [NTVDM] - Remove an unneeded assignment (cmos.c) - Reorganize BIOS code: put our 32-bit bios in a dedicated directory; start to introduce a way to load other bioses (WIP).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Feb 17 22:20:03 2014 New Revision: 62235 URL: http://svn.reactos.org/svn/reactos?rev=62235&view=rev Log: [NTVDM] - Remove an unneeded assignment (cmos.c) - Reorganize BIOS code: put our 32-bit bios in a dedicated directory; start to introduce a way to load other bioses (WIP). Added: branches/ntvdm/subsystems/ntvdm/bios/bios32/ branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c - copied, changed from r62226, branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h - copied, changed from r62226, branches/ntvdm/subsystems/ntvdm/bios/bios.h branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c - copied, changed from r62226, branches/ntvdm/subsystems/ntvdm/bios/kbdbios.c branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.h - copied, changed from r62226, branches/ntvdm/subsystems/ntvdm/bios/kbdbios.h branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c - copied, changed from r62226, branches/ntvdm/subsystems/ntvdm/bios/vidbios.c branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h - copied, changed from r62226, branches/ntvdm/subsystems/ntvdm/bios/vidbios.h Removed: branches/ntvdm/subsystems/ntvdm/bios/kbdbios.c branches/ntvdm/subsystems/ntvdm/bios/kbdbios.h branches/ntvdm/subsystems/ntvdm/bios/vidbios.c branches/ntvdm/subsystems/ntvdm/bios/vidbios.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/bios/bios.h branches/ntvdm/subsystems/ntvdm/hardware/cmos.c branches/ntvdm/subsystems/ntvdm/ntvdm.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Copied: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c (from r62226, branches/ntvdm/subsystems/ntvdm/bios/bios.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Copied: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.h (from r62226, branches/ntvdm/subsystems/ntvdm/bios/bios.h) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Copied: branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.c (from r62226, branches/ntvdm/subsystems/ntvdm/bios/kbdbios.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Copied: branches/ntvdm/subsystems/ntvdm/bios/bios32/kbdbios32.h (from r62226, branches/ntvdm/subsystems/ntvdm/bios/kbdbios.h) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Copied: branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.c (from r62226, branches/ntvdm/subsystems/ntvdm/bios/vidbios.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Copied: branches/ntvdm/subsystems/ntvdm/bios/bios32/vidbios32.h (from r62226, branches/ntvdm/subsystems/ntvdm/bios/vidbios.h) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Removed: branches/ntvdm/subsystems/ntvdm/bios/kbdbios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/kbd… Removed: branches/ntvdm/subsystems/ntvdm/bios/kbdbios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/kbd… Removed: branches/ntvdm/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vid… Removed: branches/ntvdm/subsystems/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vid… Modified: branches/ntvdm/subsystems/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?…

10 years, 10 months

[cwittich] 62234: [kernel32] sync format_msg.c with wine 1.7.11

by cwittich＠svn.reactos.org

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

10 years, 10 months

[cwittich] 62233: [comctl32] sync rebar to wine 1.7.11

by cwittich＠svn.reactos.org

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);

10 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2014