Ros-diffs June 2014

ros-diffs@reactos.org

15 participants
157 discussions

[jgardou] 63540: [NTOS/PS] - ULONG --> ULONG_PTR

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jun 4 17:12:09 2014 New Revision: 63540 URL: http://svn.reactos.org/svn/reactos?rev=63540&view=rev Log: [NTOS/PS] - ULONG --> ULONG_PTR Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=63… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Jun 4 17:12:09 2014 @@ -151,7 +151,7 @@ ProcessBasicInfo->UniqueProcessId = (ULONG_PTR)Process-> UniqueProcessId; ProcessBasicInfo->InheritedFromUniqueProcessId = - (ULONG)Process->InheritedFromUniqueProcessId; + (ULONG_PTR)Process->InheritedFromUniqueProcessId; ProcessBasicInfo->BasePriority = Process->Pcb.BasePriority; }

10 years, 6 months

[dquintana] 63539: [SHELL32] * Fix gcc compilation. [BROWSEUI/RSHELL] * Use virtual destructors and cleanup with delete in the creator functions. * Try to fix a bit the "close" flow, so that less c...

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Jun 4 16:25:48 2014 New Revision: 63539 URL: http://svn.reactos.org/svn/reactos?rev=63539&view=rev Log: [SHELL32] * Fix gcc compilation. [BROWSEUI/RSHELL] * Use virtual destructors and cleanup with delete in the creator functions. * Try to fix a bit the "close" flow, so that less circular references remain when the filebrowser windows are closed. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h branches/shell-experiments/base/shell/rshell/CMenuSite.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.h branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp branches/shell-experiments/base/shell/rshell/CMergedFolder.h branches/shell-experiments/dll/win32/browseui/addressband.cpp branches/shell-experiments/dll/win32/browseui/addressband.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.h branches/shell-experiments/dll/win32/browseui/precomp.h branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/browseui/toolsband.cpp branches/shell-experiments/dll/win32/shell32/shlview.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] Wed Jun 4 16:25:48 2014 @@ -52,7 +52,7 @@ hr = site->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) - site->Release(); + delete site; #endif return hr; @@ -255,14 +255,15 @@ return m_site->QueryInterface(riid, ppvSite); } -HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow( - HWND *phwnd) +HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow(HWND *phwnd) { if (m_SFToolbar != NULL) return m_SFToolbar->GetWindow(phwnd); if (m_staticToolbar != NULL) return m_staticToolbar->GetWindow(phwnd); + + if (phwnd) *phwnd = NULL; return E_FAIL; } @@ -417,10 +418,25 @@ ShowDW(FALSE); if (m_staticToolbar != NULL) - return m_staticToolbar->Close(); + { + m_staticToolbar->Close(); + delete m_staticToolbar; + m_staticToolbar = NULL; + } if (m_SFToolbar != NULL) - return m_SFToolbar->Close(); + { + m_SFToolbar->Close(); + delete m_staticToolbar; + m_staticToolbar = NULL; + } + + if (m_site) m_site.Release(); + if (m_psmc) m_psmc.Release(); + if (m_subMenuChild) m_subMenuChild.Release(); + if (m_subMenuParent) m_subMenuParent.Release(); + if (m_childBand) m_childBand.Release(); + if (m_parentBand) m_parentBand.Release(); return S_OK; } Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -69,7 +69,7 @@ public: CMenuBand(); - ~CMenuBand(); + virtual ~CMenuBand(); DECLARE_NOT_AGGREGATABLE(CMenuBand) DECLARE_PROTECT_FINAL_CONSTRUCT() 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] Wed Jun 4 16:25:48 2014 @@ -47,7 +47,7 @@ hr = deskbar->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) - deskbar->Release(); + delete deskbar; #endif return hr; Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -52,7 +52,7 @@ public: CMenuDeskBar(); - ~CMenuDeskBar(); + virtual ~CMenuDeskBar(); DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) DECLARE_PROTECT_FINAL_CONSTRUCT() 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] Wed Jun 4 16:25:48 2014 @@ -45,7 +45,7 @@ hr = site->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) - site->Release(); + delete site; #endif return hr; Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -39,7 +39,7 @@ public: CMenuSite(); - ~CMenuSite() {} + virtual ~CMenuSite() {} DECLARE_WND_CLASS_EX(_T("MenuSite"), 0, COLOR_MENU) Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -36,7 +36,7 @@ public: CEnumMergedFolder() : m_UserLocal(NULL), m_AllUSers(NULL), m_FirstDone(FALSE) {} - ~CEnumMergedFolder() {} + virtual ~CEnumMergedFolder() {} DECLARE_NOT_AGGREGATABLE(CEnumMergedFolder) DECLARE_PROTECT_FINAL_CONSTRUCT() @@ -139,7 +139,7 @@ hr = fld->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) - fld->Release(); + delete fld; return hr; } Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -29,7 +29,7 @@ public: CMergedFolder() {} - ~CMergedFolder() {} + virtual ~CMergedFolder() {} HRESULT _SetSources(IShellFolder* userLocal, IShellFolder* allUSers); Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -111,15 +111,9 @@ HRESULT STDMETHODCALLTYPE CAddressBand::SetSite(IUnknown *pUnkSite) { CComPtr<IBrowserService> browserService; - CComPtr<IOleWindow> oleWindow; CComPtr<IShellService> shellService; - CComPtr<IUnknown> offset34; HWND parentWindow; HWND combobox; - static const TBBUTTON buttonInfo[] = { {0, 1, TBSTATE_ENABLED, 0} }; - HIMAGELIST normalImagelist; - HIMAGELIST hotImageList; - HINSTANCE shellInstance; HRESULT hResult; if (pUnkSite == NULL) @@ -137,7 +131,7 @@ // get window handle of parent parentWindow = NULL; - hResult = IUnknown_GetWindow(pUnkSite, &parentWindow); + hResult = IUnknown_GetWindow(fSite, &parentWindow); if (!::IsWindow(parentWindow)) return E_FAIL; @@ -182,35 +176,43 @@ // TODO: properly initialize this from registry fGoButtonShown = true; - shellInstance = GetModuleHandle(_T("shell32.dll")); - normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - - fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | - WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | - CCS_NOPARENTALIGN | CCS_NORESIZE, - 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); - SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); - if (normalImagelist) - SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(normalImagelist)); - if (hotImageList) - SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(hotImageList)); - SendMessage(fGoButton, TB_ADDSTRINGW, - reinterpret_cast<WPARAM>(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); - SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM)&buttonInfo); - - IImageList * piml; - HRESULT hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); - if (FAILED_UNEXPECTEDLY(hr)) - { - SendMessageW(combobox, CBEM_SETIMAGELIST, 0, 0); - } - else - { - SendMessageW(combobox, CBEM_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); + if (fGoButtonShown) + { + const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; + HIMAGELIST normalImagelist; + HIMAGELIST hotImageList; + HINSTANCE shellInstance; + + shellInstance = GetModuleHandle(_T("shell32.dll")); + normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + + fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | + WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | + CCS_NOPARENTALIGN | CCS_NORESIZE, + 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); + SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); + if (normalImagelist) + SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(normalImagelist)); + if (hotImageList) + SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(hotImageList)); + SendMessage(fGoButton, TB_ADDSTRINGW, + reinterpret_cast<WPARAM>(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); + SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM) &buttonInfo); + + IImageList * piml; + HRESULT hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); + if (FAILED_UNEXPECTEDLY(hr)) + { + SendMessageW(combobox, CBEM_SETIMAGELIST, 0, 0); + } + else + { + SendMessageW(combobox, CBEM_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); + } } // take advice to watch events @@ -251,6 +253,9 @@ DestroyWindow(); m_hWnd = NULL; + + if (fAddressEditBox) fAddressEditBox.Release(); + if (fSite) fSite.Release(); return S_OK; } @@ -662,8 +667,8 @@ HRESULT CreateAddressBand(REFIID riid, void **ppv) { - CComObject<CAddressBand> *theMenuBar; - HRESULT hResult; + CAddressBand *theMenuBar; + HRESULT hResult; if (ppv == NULL) return E_POINTER; Modified: branches/shell-experiments/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -45,7 +45,7 @@ DWORD fAdviseCookie; public: CAddressBand(); - ~CAddressBand(); + virtual ~CAddressBand(); private: void FocusChange(BOOL bFocus); public: Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -93,6 +93,44 @@ if (FAILED(hr)) return hr; return pio->TranslateAcceleratorIO(pmsg); +} + +HRESULT IUnknown_RelayWinEvent(IUnknown * punk, HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + CComPtr<IWinEventHandler> menuWinEventHandler; + HRESULT hResult = punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = menuWinEventHandler->IsWindowOwner(hWnd); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + if (hResult == S_OK) + return menuWinEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); + return S_FALSE; +} + +HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow) +{ + CComPtr<IDockingWindow> dockingWindow; + HRESULT hResult = punk->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = dockingWindow->ShowDW(fShow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + return S_OK; +} + +HRESULT IUnknown_CloseDW(IUnknown * punk, DWORD dwReserved) +{ + CComPtr<IDockingWindow> dockingWindow; + HRESULT hResult = punk->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = dockingWindow->CloseDW(dwReserved); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + return S_OK; } typedef HRESULT(*PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); @@ -180,31 +218,19 @@ HRESULT CDockSite::Initialize(IUnknown *containedBand, CInternetToolbar *browser, HWND hwnd, int bandID, int flags) { - CComPtr<IObjectWithSite> child; - CComPtr<IOleWindow> oleWindow; - CComPtr<IDeskBand> deskBand; TCHAR textBuffer[40]; REBARBANDINFOW bandInfo; HRESULT hResult; - hResult = containedBand->QueryInterface(IID_PPV_ARG(IObjectWithSite, &child)); - if (FAILED(hResult)) - return hResult; - hResult = containedBand->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED(hResult)) - return hResult; - hResult = containedBand->QueryInterface(IID_PPV_ARG(IDeskBand, &deskBand)); - if (FAILED(hResult)) - return hResult; fContainedBand = containedBand; fToolbar = browser; fRebarWindow = hwnd; fBandID = bandID; fFlags = flags; - hResult = child->SetSite(static_cast<IOleWindow *>(this)); - if (FAILED(hResult)) - return hResult; - hResult = oleWindow->GetWindow(&fChildWindow); + hResult = IUnknown_SetSite(containedBand, static_cast<IOleWindow *>(this)); + if (FAILED(hResult)) + return hResult; + hResult = IUnknown_GetWindow(containedBand, &fChildWindow); if (FAILED(hResult)) return hResult; @@ -533,10 +559,9 @@ void CInternetToolbar::AddDockItem(IUnknown *newItem, int bandID, int flags) { - CDockSite *newSite; + CComPtr<CDockSite> newSite; newSite = new CComObject<CDockSite>; - newSite->AddRef(); newSite->Initialize(newItem, this, fMainReBar, bandID, flags); } @@ -624,10 +649,7 @@ hResult = (*menuBar)->SetMenu((HMENU)V_INTREF(&menuOut), ownerWindow, SMSET_DONTOWN); if (FAILED(hResult)) return hResult; - hResult = (*menuBar)->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED(hResult)) - return hResult; - hResult = commandTarget->Exec(&CGID_MenuBand, 3, 1, NULL, NULL); + hResult = IUnknown_Exec(*menuBar, CGID_MenuBand, 3, 1, NULL, NULL); if (FAILED(hResult)) return hResult; return S_OK; @@ -635,43 +657,25 @@ HRESULT CInternetToolbar::CreateBrandBand(IUnknown **logoBar) { - CComPtr<IUnknown> tempBand; - HRESULT hResult; - #if 1 - hResult = ::CreateBrandBand(IID_PPV_ARG(IUnknown, logoBar)); + return ::CreateBrandBand(IID_PPV_ARG(IUnknown, logoBar)); #else - hResult = CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, logoBar)); + return CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, logoBar)); #endif - if (FAILED(hResult)) - return hResult; - return S_OK; } HRESULT CInternetToolbar::CreateToolsBar(IUnknown **toolsBar) { - HRESULT hResult; - - hResult = ::CreateToolsBar(IID_PPV_ARG(IUnknown, toolsBar)); - if (FAILED(hResult)) - return hResult; - return S_OK; + return ::CreateToolsBar(IID_PPV_ARG(IUnknown, toolsBar)); } HRESULT CInternetToolbar::CreateAddressBand(IUnknown **toolsBar) { - CComPtr<IAddressBand> addressBand; - HRESULT hResult; - #if 1 - hResult = ::CreateAddressBand(IID_PPV_ARG(IUnknown, toolsBar)); + return ::CreateAddressBand(IID_PPV_ARG(IUnknown, toolsBar)); #else - hResult = CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, toolsBar)); + return CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, toolsBar)); #endif - if (FAILED(hResult)) - return hResult; - hResult = (*toolsBar)->QueryInterface(IID_PPV_ARG(IAddressBand, &addressBand)); - return S_OK; } HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) @@ -825,43 +829,54 @@ if (fShow) { hResult = ReserveBorderSpace(); - } + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + if (fMenuBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->ShowDW(fShow); - } + hResult = IUnknown_ShowDW(fMenuBar, fShow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + if (fControlsBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->ShowDW(fShow); + hResult = IUnknown_ShowDW(fControlsBar, fShow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; } if (fNavigationBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->ShowDW(fShow); + hResult = IUnknown_ShowDW(fNavigationBar, fShow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; } if (fLogoBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fLogoBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->ShowDW(fShow); + hResult = IUnknown_ShowDW(fLogoBar, fShow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; } return S_OK; } template<class T> -void ReleaseCComPtrExpectZero(CComPtr<T>& cptr) +void ReleaseCComPtrExpectZero(CComPtr<T>& cptr, BOOL forceRelease = FALSE) { if (cptr.p != NULL) { int nrc = cptr->Release(); if (nrc > 0) { - DbgPrint("WARNING: Unexpected RefCount > 0!\n"); + DbgPrint("WARNING: Unexpected RefCount > 0 (%d)!\n", nrc); + if (forceRelease) + { + while (nrc > 0) + { + nrc = cptr->Release(); + } + } } cptr.Detach(); } @@ -873,32 +888,32 @@ if (fMenuBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->CloseDW(dwReserved); - } - ReleaseCComPtrExpectZero(fMenuBar); + hResult = IUnknown_CloseDW(fMenuBar, dwReserved); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + ReleaseCComPtrExpectZero(fMenuBar); + } if (fControlsBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->CloseDW(dwReserved); - } - ReleaseCComPtrExpectZero(fControlsBar); + hResult = IUnknown_CloseDW(fControlsBar, dwReserved); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + ReleaseCComPtrExpectZero(fControlsBar); + } if (fNavigationBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->CloseDW(dwReserved); - } - ReleaseCComPtrExpectZero(fNavigationBar); + hResult = IUnknown_CloseDW(fNavigationBar, dwReserved); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + ReleaseCComPtrExpectZero(fNavigationBar); + } if (fLogoBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fLogoBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->CloseDW(dwReserved); - } - ReleaseCComPtrExpectZero(fLogoBar); + hResult = IUnknown_CloseDW(fLogoBar, dwReserved); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + ReleaseCComPtrExpectZero(fLogoBar); + } return S_OK; } @@ -971,9 +986,6 @@ CComPtr<IUnknown> logoBar; CComPtr<IUnknown> toolsBar; CComPtr<IUnknown> navigationBar; - CComPtr<IOleWindow> menuOleWindow; - CComPtr<IOleWindow> toolbarOleWindow; - CComPtr<IOleWindow> navigationOleWindow; HRESULT hResult; /* Create and attach the menubar to the rebar */ @@ -982,8 +994,7 @@ return hResult; AddDockItem(menuBar, ITBBID_MENUBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); - hResult = menuBar->QueryInterface(IID_PPV_ARG(IOleWindow, &menuOleWindow)); - hResult = menuOleWindow->GetWindow(&fMenuBandWindow); + hResult = IUnknown_GetWindow(menuBar, &fMenuBandWindow); fMenuBar.Attach(menuBar.Detach()); // transfer the ref count // FIXME: The ros Rebar does not properly support fixed-size items such as the brandband, @@ -1003,10 +1014,7 @@ return hResult; AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); fControlsBar.Attach(toolsBar.Detach()); // transfer the ref count - hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IOleWindow, &toolbarOleWindow)); - if (FAILED(hResult)) - return hResult; - hResult = toolbarOleWindow->GetWindow(&fToolbarWindow); + hResult = IUnknown_GetWindow(fControlsBar, &fToolbarWindow); if (FAILED(hResult)) return hResult; @@ -1015,9 +1023,8 @@ if (FAILED(hResult)) return hResult; AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); - hResult = navigationBar->QueryInterface(IID_PPV_ARG(IOleWindow, &navigationOleWindow)); - hResult = navigationOleWindow->GetWindow(&fNavigationWindow); fNavigationBar.Attach(navigationBar.Detach()); + hResult = IUnknown_GetWindow(fNavigationBar, &fNavigationWindow); return S_OK; } @@ -1330,16 +1337,27 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::OnWinEvent( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - CComPtr<IWinEventHandler> menuWinEventHandler; HRESULT hResult; if (fMenuBar) { - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); - if (menuWinEventHandler->IsWindowOwner(hWnd) == S_OK) - { - return menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, theResult); - } + hResult = IUnknown_RelayWinEvent(fMenuBar, hWnd, uMsg, wParam, lParam, theResult); + if (hResult != S_FALSE) + return hResult; + } + + if (fNavigationBar) + { + hResult = IUnknown_RelayWinEvent(fNavigationBar, hWnd, uMsg, wParam, lParam, theResult); + if (hResult != S_FALSE) + return hResult; + } + + if (fLogoBar) + { + hResult = IUnknown_RelayWinEvent(fLogoBar, hWnd, uMsg, wParam, lParam, theResult); + if (hResult != S_FALSE) + return hResult; } return S_FALSE; @@ -1347,16 +1365,19 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::IsWindowOwner(HWND hWnd) { + UNIMPLEMENTED; return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CInternetToolbar::AddBand(IUnknown *punk) { + UNIMPLEMENTED; return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CInternetToolbar::EnumBands(UINT uBand, DWORD *pdwBandID) { + UNIMPLEMENTED; return E_NOTIMPL; } @@ -1751,37 +1772,12 @@ { LRESULT theResult; HRESULT hResult; - HWND target = (HWND) lParam; - - if (fMenuBar) - { - CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); - if (SUCCEEDED(hResult)) - { - if (menuWinEventHandler->IsWindowOwner(target) == S_OK) - { - hResult = menuWinEventHandler->OnWinEvent(target, uMsg, wParam, lParam, &theResult); - return FAILED(hResult) ? 0 : theResult; - } - } - } - - if (fNavigationBar) - { - CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); - if (SUCCEEDED(hResult)) - { - if (menuWinEventHandler->IsWindowOwner(target) == S_OK) - { - hResult = menuWinEventHandler->OnWinEvent(target, uMsg, wParam, lParam, &theResult); - return FAILED(hResult) ? 0 : theResult; - } - } - } - - return 0; + + hResult = OnWinEvent((HWND) lParam, uMsg, wParam, lParam, &theResult); + + bHandled = hResult == S_OK; + + return FAILED_UNEXPECTEDLY(hResult) ? 0 : theResult; } LRESULT CInternetToolbar::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { @@ -1789,37 +1785,13 @@ LRESULT theResult; HRESULT hResult; - notifyHeader = (NMHDR *) lParam; - - if (fMenuBar) - { - CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); - if (SUCCEEDED(hResult)) - { - if (menuWinEventHandler->IsWindowOwner(notifyHeader->hwndFrom) == S_OK) - { - hResult = menuWinEventHandler->OnWinEvent(notifyHeader->hwndFrom, uMsg, wParam, lParam, &theResult); - return FAILED(hResult) ? 0 : theResult; - } - } - } - - if (fNavigationBar) - { - CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); - if (SUCCEEDED(hResult)) - { - if (menuWinEventHandler->IsWindowOwner(notifyHeader->hwndFrom) == S_OK) - { - hResult = menuWinEventHandler->OnWinEvent(notifyHeader->hwndFrom, uMsg, wParam, lParam, &theResult); - return FAILED(hResult) ? 0 : theResult; - } - } - } - - return 0; + notifyHeader = reinterpret_cast<NMHDR *>(lParam); + + hResult = OnWinEvent(notifyHeader->hwndFrom, uMsg, wParam, lParam, &theResult); + + bHandled = hResult == S_OK; + + return FAILED_UNEXPECTEDLY(hResult) ? 0 : theResult; } LRESULT CInternetToolbar::OnLDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) @@ -1884,8 +1856,8 @@ HRESULT CreateInternetToolbar(REFIID riid, void **ppv) { - CComObject<CInternetToolbar> *theToolbar; - HRESULT hResult; + CInternetToolbar *theToolbar; + HRESULT hResult; if (ppv == NULL) return E_POINTER; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -45,7 +45,7 @@ CComPtr<IShellMenu> fFavoritesMenu; public: CMenuCallback(); - ~CMenuCallback(); + virtual ~CMenuCallback(); HRESULT STDMETHODCALLTYPE GetObject(LPSMDATA psmd, REFIID riid, void **ppvObject); public: @@ -94,7 +94,7 @@ LONG fStartHeight; public: CInternetToolbar(); - ~CInternetToolbar(); + virtual ~CInternetToolbar(); void AddDockItem(IUnknown *newItem, int bandID, int flags); HRESULT ReserveBorderSpace(LONG maxHeight = -1); HRESULT CreateMenuBar(IShellMenu **menuBar); Modified: branches/shell-experiments/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/precomp.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -82,6 +82,78 @@ #define FAILED_UNEXPECTEDLY(hr) FAILED(hr) #endif + +template <class Base> +class CComDebugObject : public Base +{ +public: + CComDebugObject(void * = NULL) + { + _pAtlModule->Lock(); + } + + virtual ~CComDebugObject() + { + this->FinalRelease(); + _pAtlModule->Unlock(); + } + + STDMETHOD_(ULONG, AddRef)() + { + int rc = this->InternalAddRef(); + DbgPrint("RefCount is now %d(++)!\n", rc); + return rc; + } + + STDMETHOD_(ULONG, Release)() + { + ULONG newRefCount; + + newRefCount = this->InternalRelease(); + DbgPrint("RefCount is now %d(--)!\n", newRefCount); + if (newRefCount == 0) + delete this; + return newRefCount; + } + + STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) + { + return this->_InternalQueryInterface(iid, ppvObject); + } + + static HRESULT WINAPI CreateInstance(CComDebugObject<Base> **pp) + { + CComDebugObject<Base> *newInstance; + HRESULT hResult; + + ATLASSERT(pp != NULL); + if (pp == NULL) + return E_POINTER; + + hResult = E_OUTOFMEMORY; + newInstance = NULL; + ATLTRY(newInstance = new CComDebugObject<Base>()) + if (newInstance != NULL) + { + newInstance->SetVoid(NULL); + newInstance->InternalFinalConstructAddRef(); + hResult = newInstance->_AtlInitialConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->FinalConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->_AtlFinalConstruct(); + newInstance->InternalFinalConstructRelease(); + if (hResult != S_OK) + { + delete newInstance; + newInstance = NULL; + } + } + *pp = newInstance; + return hResult; + } +}; + WINE_DEFAULT_DEBUG_CHANNEL(browseui); #endif /* _BROWSEUI_PCH_ */ Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -28,6 +28,8 @@ _Out_ HIMAGELIST *phiml, _Out_ HIMAGELIST *phimlSmall ); + +extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); #include "newatlinterfaces.h" @@ -732,12 +734,9 @@ HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, long b, long c, long d) { - CComPtr<IDockingWindow> dockingWindow; - CComPtr<IStream> settingsStream; CComPtr<IPersistStreamInit> persistStreamInit; - CComPtr<IOleCommandTarget> commandTarget; - CComPtr<IObjectWithSite> objectSite; - HRESULT hResult; + HRESULT hResult; + CComPtr<IUnknown> clientBar; _AtlInitialConstruct(); @@ -756,61 +755,53 @@ if (FAILED(hResult)) return hResult; #else - hResult = CreateInternetToolbar(IID_PPV_ARG(IUnknown, &fClientBars[BIInternetToolbar].clientBar)); + hResult = CreateInternetToolbar(IID_PPV_ARG(IUnknown, &clientBar)); if (FAILED(hResult)) return hResult; #endif + fClientBars[BIInternetToolbar].clientBar = clientBar; + // create interfaces - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IDockingWindow, &dockingWindow)); - if (FAILED(hResult)) + hResult = clientBar->QueryInterface(IID_PPV_ARG(IPersistStreamInit, &persistStreamInit)); + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IPersistStreamInit, &persistStreamInit)); + + hResult = IUnknown_SetSite(clientBar, static_cast<IShellBrowser *>(this)); if (FAILED(hResult)) return hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IOleCommandTarget, &commandTarget)); + + hResult = IUnknown_Exec(clientBar, CGID_PrivCITCommands, 1, 1 /* or 0 */, NULL, NULL); if (FAILED(hResult)) return hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IObjectWithSite, &objectSite)); - if (FAILED(hResult)) - return hResult; - - hResult = objectSite->SetSite(static_cast<IShellBrowser *>(this)); - if (FAILED(hResult)) - return hResult; - - hResult = commandTarget->Exec(&CGID_PrivCITCommands, 1, 1 /* or 0 */, NULL, NULL); - if (FAILED(hResult)) - return hResult; // TODO: create settingsStream from registry entry - if (settingsStream.p == NULL) + //if (settingsStream.p) + //{ + // hResult = persistStreamInit->Load(settingsStream); + // if (FAILED_UNEXPECTEDLY(hResult)) + // return hResult; + //} + //else { hResult = persistStreamInit->InitNew(); if (FAILED(hResult)) return hResult; } - else - { - hResult = persistStreamInit->Load(settingsStream); - if (FAILED(hResult)) - return hResult; - } - hResult = dockingWindow->ShowDW(TRUE); - if (FAILED(hResult)) + + hResult = IUnknown_ShowDW(clientBar, TRUE); + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - fToolbarProxy.Initialize(m_hWnd, fClientBars[BIInternetToolbar].clientBar); + fToolbarProxy.Initialize(m_hWnd, clientBar); + // create status bar fStatusBar = CreateWindow(STATUSCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | SBT_NOBORDERS | SBT_TOOLTIPS, 0, 0, 500, 20, m_hWnd, (HMENU)0xa001, _AtlBaseModule.GetModuleInstance(), 0); fStatusBarVisible = true; + // browse hResult = BrowseToPIDL(pidl, BTP_UPDATE_NEXT_HISTORY); @@ -1091,14 +1082,8 @@ CComPtr<IDeskBand> deskBand; HRESULT hResult; - if (fClientBars[BIInternetToolbar].clientBar.p == NULL) - return E_FAIL; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED(hResult)) - return hResult; - hResult = serviceProvider->QueryService(SID_IBandSite, IID_PPV_ARG(IBandSite, &bandSite)); - if (FAILED(hResult)) + hResult = IUnknown_QueryService(fClientBars[BIInternetToolbar].clientBar, SID_IBandSite, IID_PPV_ARG(IBandSite, &bandSite)); + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0); if (FAILED(hResult)) @@ -1291,7 +1276,6 @@ CShellBrowser *pThis = reinterpret_cast<CShellBrowser *>(hWnd); _ATL_MSG msg(pThis->m_hWnd, uMsg, wParam, lParam); LRESULT lResult; - CComPtr<IMenuBand> menuBand; const _ATL_MSG *previousMessage; BOOL handled; WNDPROC saveWindowProc; @@ -1301,6 +1285,7 @@ previousMessage = pThis->m_pCurrentMsg; pThis->m_pCurrentMsg = &msg; + CComPtr<IMenuBand> menuBand; hResult = pThis->GetMenuBand(IID_PPV_ARG(IMenuBand, &menuBand)); if (SUCCEEDED(hResult) && menuBand.p != NULL) { @@ -1311,6 +1296,7 @@ wParam = msg.wParam; lParam = msg.lParam; } + menuBand.Release(); handled = pThis->ProcessWindowMessage(hWnd, uMsg, wParam, lParam, lResult, 0); ATLASSERT(pThis->m_pCurrentMsg == &msg); @@ -1867,7 +1853,7 @@ CComPtr<IShellMenu> shellMenu; HRESULT hResult; - if (IsMenu(hmenuShared) == FALSE) + if (hmenuShared && IsMenu(hmenuShared) == FALSE) return E_FAIL; hResult = GetMenuBand(IID_PPV_ARG(IShellMenu, &shellMenu)); if (FAILED(hResult)) @@ -1882,7 +1868,10 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::RemoveMenusSB(HMENU hmenuShared) { if (hmenuShared == fCurrentMenuBar) - fCurrentMenuBar = NULL; + { + //DestroyMenu(fCurrentMenuBar); + SetMenuSB(NULL, NULL, NULL); + } return S_OK; } @@ -3072,7 +3061,7 @@ } template<class T> -void ReleaseCComPtrExpectZero(CComPtr<T>& cptr) +void ReleaseCComPtrExpectZero(CComPtr<T>& cptr, BOOL forceRelease = FALSE) { if (cptr.p != NULL) { @@ -3080,6 +3069,13 @@ if (nrc > 0) { DbgPrint("WARNING: Unexpected RefCount > 0!\n"); + if (forceRelease) + { + while (nrc > 0) + { + nrc = cptr->Release(); + } + } } cptr.Detach(); } @@ -3361,8 +3357,8 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) { - CComPtr< CComObject<CShellBrowser> > theCabinet; - HRESULT hResult; + CComPtr<CShellBrowser> theCabinet; + HRESULT hResult; MSG Msg; BOOL Ret; @@ -3384,14 +3380,14 @@ break; } + if (Msg.message == WM_QUIT) + break; + if (theCabinet->v_MayTranslateAccelerator(&Msg) != S_OK) { TranslateMessage(&Msg); DispatchMessage(&Msg); } - - if (Msg.message == WM_QUIT) - break; } //TerminateProcess(GetCurrentProcess(), hResult); @@ -3399,7 +3395,9 @@ int nrc = theCabinet->Release(); if (nrc > 0) { - DbgPrint("WARNING: There are %d references to the CShellBrowser active or leaked, process will never terminate.\n"); + DbgPrint("WARNING: There are %d references to the CShellBrowser active or leaked, process will never terminate. Terminating forcefully.\n", nrc); + + //TerminateProcess(GetCurrentProcess(), 1); } theCabinet.Detach(); Modified: branches/shell-experiments/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -37,12 +37,12 @@ public IPersistStream { private: - IDockingWindowSite *fDockSite; + CComPtr<IDockingWindowSite> fDockSite; GUID fExecCommandCategory; CComPtr<IOleCommandTarget> fExecCommandTarget; public: CToolsBand(); - ~CToolsBand(); + virtual ~CToolsBand(); public: // *** IDeskBand methods *** virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO* pdbi); @@ -95,14 +95,12 @@ }; CToolsBand::CToolsBand() -{ - fDockSite = NULL; + : fDockSite(NULL) +{ } CToolsBand::~CToolsBand() { - if (fDockSite) - fDockSite->Release(); } HRESULT STDMETHODCALLTYPE CToolsBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO* pdbi) @@ -267,8 +265,8 @@ HWND toolbar; HRESULT hResult; - if (fDockSite != NULL) - fDockSite->Release(); + if(fDockSite) fDockSite.Release(); + if (pUnkSite == NULL) return S_OK; hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &fDockSite)); @@ -364,6 +362,8 @@ m_hWnd = NULL; + if (fDockSite) fDockSite.Release(); + return S_OK; } @@ -440,19 +440,19 @@ HRESULT CreateToolsBar(REFIID riid, void **ppv) { - CComObject<CToolsBand> *theMenuBar; - HRESULT hResult; + CToolsBand *theToolbar; + HRESULT hResult; if (ppv == NULL) return E_POINTER; *ppv = NULL; - ATLTRY (theMenuBar = new CComObject<CToolsBand>); - if (theMenuBar == NULL) + ATLTRY(theToolbar = new CComObject<CToolsBand>); + if (theToolbar == NULL) return E_OUTOFMEMORY; - hResult = theMenuBar->QueryInterface(riid, reinterpret_cast<void **>(ppv)); + hResult = theToolbar->QueryInterface(riid, reinterpret_cast<void **>(ppv)); if (FAILED(hResult)) { - delete theMenuBar; + delete theToolbar; return hResult; } return S_OK; Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -1382,7 +1382,6 @@ INT mic = GetMenuItemCount(m_hMenu); for (int i = 0; i < mic; i++) { - HMENU submenu = GetSubMenu(m_hMenu, 0); DeleteMenu(m_hMenu, 0, MF_BYPOSITION); }

10 years, 6 months

[aandrejevic] 63538: [NTVDM] Fix the command line NULL-termination.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Jun 3 22:34:49 2014 New Revision: 63538 URL: http://svn.reactos.org/svn/reactos?rev=63538&view=rev Log: [NTVDM] Fix the command line NULL-termination. Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Tue Jun 3 22:34:49 2014 @@ -915,6 +915,7 @@ PIMAGE_DOS_HEADER Header; PDWORD RelocationTable; PWORD RelocWord; + LPSTR CmdLinePtr = (LPSTR)CommandLine; DPRINT1("DosLoadExecutable(%d, %s, %s, %s, 0x%08X, 0x%08X)\n", LoadType, @@ -931,8 +932,8 @@ } /* NULL-terminate the command line by removing the return carriage character */ - while (*CommandLine && *CommandLine != '\r') CommandLine++; - *(LPSTR)CommandLine = '\0'; + while (*CmdLinePtr && *CmdLinePtr != '\r') CmdLinePtr++; + *CmdLinePtr = '\0'; /* Open a handle to the executable */ FileHandle = CreateFileA(ExecutablePath,

10 years, 6 months

[dquintana] 63537: [BROWSEUI] * Plug a few menu leaks. In Windows, it brings down the leaked menus from 20 per navigation, to only 1-2. In ReactOS, from 60 to 20. [RSHELL, SHELL32] * Code tweaks tha...

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Jun 3 01:04:19 2014 New Revision: 63537 URL: http://svn.reactos.org/svn/reactos?rev=63537&view=rev Log: [BROWSEUI] * Plug a few menu leaks. In Windows, it brings down the leaked menus from 20 per navigation, to only 1-2. In ReactOS, from 60 to 20. [RSHELL,SHELL32] * Code tweaks that shouldn't change the actual behaviour. Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Tue Jun 3 01:04:19 2014 @@ -1095,6 +1095,10 @@ { } +CMenuStaticToolbar::~CMenuStaticToolbar() +{ +} + HRESULT CMenuStaticToolbar::GetMenu( _Out_opt_ HMENU *phmenu, _Out_opt_ HWND *phwnd, Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Tue Jun 3 01:04:19 2014 @@ -132,7 +132,7 @@ public: CMenuStaticToolbar(CMenuBand *menuBand); - virtual ~CMenuStaticToolbar() {} + virtual ~CMenuStaticToolbar(); HRESULT SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Tue Jun 3 01:04:19 2014 @@ -1680,6 +1680,8 @@ SendMessage(fToolbarWindow, TB_CUSTOMIZE, 0, 0); break; } + + DestroyMenu(contextMenuBar); return 1; } Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Tue Jun 3 01:04:19 2014 @@ -1571,8 +1571,15 @@ DeleteMenu(theMenu, IDM_VIEW_TOOLBARS, MF_BYCOMMAND); else { + menuItemInfo.cbSize = sizeof(menuItemInfo); + menuItemInfo.fMask = MIIM_SUBMENU; + GetMenuItemInfo(theMenu, IDM_VIEW_TOOLBARS, FALSE, &menuItemInfo); + DestroyMenu(menuItemInfo.hSubMenu); + toolbarMenuBar = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_CABINET_CONTEXTMENU)); toolbarMenu = GetSubMenu(toolbarMenuBar, 0); + RemoveMenu(toolbarMenuBar, 0, MF_BYPOSITION); + DestroyMenu(toolbarMenuBar); SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_STANDARDBUTTONS, commandList[0].cmdf); SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_ADDRESSBAR, commandList[1].cmdf & OLECMDF_ENABLED); @@ -1847,6 +1854,8 @@ int GCCU(itemCount3) = GetMenuItemCount(hmenuShared); Unused(itemCount3); + DestroyMenu(mainMenu); + lpMenuWidths->width[0] = 2; lpMenuWidths->width[2] = 3; lpMenuWidths->width[4] = 1; Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Tue Jun 3 01:04:19 2014 @@ -1383,9 +1383,7 @@ for (int i = 0; i < mic; i++) { HMENU submenu = GetSubMenu(m_hMenu, 0); - RemoveMenu(m_hMenu, 0, MF_BYPOSITION); - if (submenu) - DestroyMenu(submenu); + DeleteMenu(m_hMenu, 0, MF_BYPOSITION); } m_pShellBrowser->InsertMenusSB(m_hMenu, &omw);

10 years, 6 months

[dquintana] 63536: [BROWSEUI] * Fix gcc build.

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Jun 2 21:37:26 2014 New Revision: 63536 URL: http://svn.reactos.org/svn/reactos?rev=63536&view=rev Log: [BROWSEUI] * Fix gcc build. Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon Jun 2 21:37:26 2014 @@ -3352,7 +3352,7 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) { - CComPtr<CComObject<CShellBrowser>> theCabinet; + CComPtr< CComObject<CShellBrowser> > theCabinet; HRESULT hResult; MSG Msg; BOOL Ret;

10 years, 6 months

[dquintana] 63535: [BROWSEUI/RSHELL] * Begin fixing the process of destroying the related objects when closing the window, so that eventually the filebrowser/explorer process will properly exit cle...

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Jun 2 21:35:32 2014 New Revision: 63535 URL: http://svn.reactos.org/svn/reactos?rev=63535&view=rev Log: [BROWSEUI/RSHELL] * Begin fixing the process of destroying the related objects when closing the window, so that eventually the filebrowser/explorer process will properly exit cleanly when no more windows are open. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.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 Jun 2 21:35:32 2014 @@ -74,7 +74,8 @@ m_hotBar(NULL), m_hotItem(-1), m_popupBar(NULL), - m_popupItem(-1) + m_popupItem(-1), + m_Show(FALSE) { m_focusManager = CMenuFocusManager::AcquireManager(); } @@ -363,6 +364,9 @@ { HRESULT hr = S_OK; + if (m_Show == fShow) + return S_OK; + if (m_staticToolbar != NULL) { hr = m_staticToolbar->ShowWindow(fShow); @@ -402,6 +406,8 @@ else hr = m_focusManager->PopMenuBar(this); } + + m_Show = fShow; return S_OK; } Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Mon Jun 2 21:35:32 2014 @@ -65,6 +65,8 @@ CMenuToolbarBase * m_popupBar; INT m_popupItem; + BOOL m_Show; + public: CMenuBand(); ~CMenuBand(); Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon Jun 2 21:35:32 2014 @@ -819,19 +819,87 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::ShowDW(BOOL fShow) { - CComPtr<IDockingWindow> dockingWindow; HRESULT hResult; // show the bar here - hResult = ReserveBorderSpace(); - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->ShowDW(fShow); - return S_OK; + if (fShow) + { + hResult = ReserveBorderSpace(); + } + if (fMenuBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->ShowDW(fShow); + } + if (fControlsBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->ShowDW(fShow); + } + if (fNavigationBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->ShowDW(fShow); + } + if (fLogoBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fLogoBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->ShowDW(fShow); + } + return S_OK; +} + +template<class T> +void ReleaseCComPtrExpectZero(CComPtr<T>& cptr) +{ + if (cptr.p != NULL) + { + int nrc = cptr->Release(); + if (nrc > 0) + { + DbgPrint("WARNING: Unexpected RefCount > 0!\n"); + } + cptr.Detach(); + } } HRESULT STDMETHODCALLTYPE CInternetToolbar::CloseDW(DWORD dwReserved) { - return E_NOTIMPL; + HRESULT hResult; + + if (fMenuBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->CloseDW(dwReserved); + } + ReleaseCComPtrExpectZero(fMenuBar); + if (fControlsBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->CloseDW(dwReserved); + } + ReleaseCComPtrExpectZero(fControlsBar); + if (fNavigationBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->CloseDW(dwReserved); + } + ReleaseCComPtrExpectZero(fNavigationBar); + if (fLogoBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fLogoBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->CloseDW(dwReserved); + } + ReleaseCComPtrExpectZero(fLogoBar); + return S_OK; } HRESULT STDMETHODCALLTYPE CInternetToolbar::ResizeBorderDW(LPCRECT prcBorder, Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon Jun 2 21:35:32 2014 @@ -3062,9 +3062,49 @@ return 0; } +template<class T> +void ReleaseCComPtrExpectZero(CComPtr<T>& cptr) +{ + if (cptr.p != NULL) + { + int nrc = cptr->Release(); + if (nrc > 0) + { + DbgPrint("WARNING: Unexpected RefCount > 0!\n"); + } + cptr.Detach(); + } +} + LRESULT CShellBrowser::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { + HRESULT hr; // TODO: rip down everything + { + fCurrentShellView->DestroyViewWindow(); + fCurrentShellView->UIActivate(SVUIA_DEACTIVATE); + ReleaseCComPtrExpectZero(fCurrentShellView); + + for (int i = 0; i < 3; i++) + { + if (fClientBars[i].clientBar == NULL) + continue; + IDockingWindow * pdw; + hr = fClientBars[i].clientBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &pdw)); + if (FAILED_UNEXPECTEDLY(hr)) + continue; + pdw->ShowDW(FALSE); + pdw->CloseDW(0); + pdw->Release(); + ReleaseCComPtrExpectZero(fClientBars[i].clientBar); + } + ReleaseCComPtrExpectZero(fTravelLog); + + fCurrentShellFolder.Release(); + ILFree(fCurrentDirectoryPIDL); + ::DestroyWindow(fStatusBar); + DestroyMenu(fCurrentMenuBar); + } PostQuitMessage(0); return 0; } @@ -3312,31 +3352,20 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) { - CComPtr<IShellBrowser> shellBrowser; - CComObject<CShellBrowser> *theCabinet; + CComPtr<CComObject<CShellBrowser>> theCabinet; HRESULT hResult; MSG Msg; BOOL Ret; - - OleInitialize(NULL); - + ATLTRY(theCabinet = new CComObject<CShellBrowser>); if (theCabinet == NULL) { - hResult = E_OUTOFMEMORY; - goto uninitialize; - } - - hResult = theCabinet->QueryInterface(IID_PPV_ARG(IShellBrowser, &shellBrowser)); - if (FAILED(hResult)) - { - delete theCabinet; - goto uninitialize; - } - + return E_OUTOFMEMORY; + } + hResult = theCabinet->Initialize(parameters->directoryPIDL, 0, 0, 0); if (FAILED(hResult)) - goto uninitialize; + return E_OUTOFMEMORY; while ((Ret = GetMessage(&Msg, NULL, 0, 0)) != 0) { @@ -3355,14 +3384,30 @@ if (Msg.message == WM_QUIT) break; } - -uninitialize: + + //TerminateProcess(GetCurrentProcess(), hResult); + + int nrc = theCabinet->Release(); + if (nrc > 0) + { + DbgPrint("WARNING: There are %d references to the CShellBrowser active or leaked, process will never terminate.\n"); + } + + theCabinet.Detach(); + + return hResult; +} + +DWORD WINAPI BrowserThreadProc(LPVOID lpThreadParameter) +{ + HRESULT hr; + IEThreadParamBlock * parameters = (IEThreadParamBlock *) lpThreadParameter; + + OleInitialize(NULL); + + ATLTRY(hr = ExplorerMessageLoop(parameters)); + OleUninitialize(); - return hResult; -} - -DWORD WINAPI BrowserThreadProc(LPVOID lpThreadParameter) -{ - IEThreadParamBlock * parameters = (IEThreadParamBlock *) lpThreadParameter; - return ExplorerMessageLoop(parameters); -} + + return hr; +}

10 years, 6 months

[aandrejevic] 63534: [NTVDM] Initialize the VGA-related BDA data fields.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Jun 2 18:24:58 2014 New Revision: 63534 URL: http://svn.reactos.org/svn/reactos?rev=63534&view=rev Log: [NTVDM] Initialize the VGA-related BDA data fields. Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h trunk/reactos/subsystems/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] Mon Jun 2 18:24:58 2014 @@ -76,7 +76,8 @@ WORD KeybdBufferEnd; // 0x82 BYTE ScreenRows; // 0x84 WORD CharacterHeight; // 0x85 - BYTE EGAFlags[2]; // 0x87 + BYTE VGAOptions; // 0x87 + BYTE VGASwitches; // 0x88 BYTE VGAFlags[2]; // 0x89 DWORD Reserved3; // 0x8b BYTE Reserved4; // 0x8f Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Mon Jun 2 18:24:58 2014 @@ -1572,6 +1572,10 @@ ((PULONG)BaseAddress)[0x43] = (ULONG)NULL; ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; + /* Initialize the VGA BDA data */ + Bda->VGAOptions = 0x30; /* 256 KB Video RAM */ + Bda->VGASwitches = 0x09; /* High-resolution */ + // // FIXME: At the moment we always set a VGA mode. In the future, // we should set this mode **only** when:

10 years, 6 months

[dquintana] 63533: [BROWSEUI] * This shouldn't have been commited. The browse windows were freezing because it was trying to use the menu from shell32 instead of rshell.

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Jun 2 13:23:06 2014 New Revision: 63533 URL: http://svn.reactos.org/svn/reactos?rev=63533&view=rev Log: [BROWSEUI] * This shouldn't have been commited. The browse windows were freezing because it was trying to use the menu from shell32 instead of rshell. Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon Jun 2 13:23:06 2014 @@ -29,7 +29,7 @@ #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) -#define USE_CUSTOM_MENUBAND 0 +#define USE_CUSTOM_MENUBAND 1 // navigation controls and menubar just send a message to parent window /*

10 years, 6 months

[khornicek] 63532: [KBDCZ][KBDCZ1] - add support for VK_OEM_102 and Shift+AltGr combinations in kbdcz1 - fix left arrow in kbdcz - reduce diff between the layouts - misc cleanup - Patch by Radek Li...

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Jun 2 10:41:52 2014 New Revision: 63532 URL: http://svn.reactos.org/svn/reactos?rev=63532&view=rev Log: [KBDCZ][KBDCZ1] - add support for VK_OEM_102 and Shift+AltGr combinations in kbdcz1 - fix left arrow in kbdcz - reduce diff between the layouts - misc cleanup - Patch by Radek Liska CORE-8283 Modified: trunk/reactos/dll/keyboard/kbdcz/kbdcz.c trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c Modified: trunk/reactos/dll/keyboard/kbdcz/kbdcz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz/kbdcz.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz/kbdcz.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz/kbdcz.c [iso-8859-1] Mon Jun 2 10:41:52 2014 @@ -78,7 +78,7 @@ VK_SNAPSHOT, /* - 55 - */ /* Oddities, and the remaining standard F-Keys */ - VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, /* - 59 - */ VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ @@ -159,20 +159,45 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, - 7, - { 0, 1, 2, 0, 0, 0, 3, 0 } - /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ + 7, /* Modifier bit order */ + { + 0, /* NONE */ + 1, /* SHIFT */ + 2, /* CTRL */ + 0, /* SHIFT-CTRL (not used) */ + 0, /* ALT (not used) */ + 0, /* SHIFT-ALT (not used) */ + 3, /* CTRL-ALT */ + 0, /* SHIFT-CTRL-ALT (not used) */ + } +}; +/* ^ This table shows which column in any VK_TO_WCHARS* structure will be used on which modifier */ + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {','} }, + { VK_BACK, 0, {'\010'} }, + { 0, 0 } }; ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Keys that do not have shift states */ - { VK_TAB, 0, {'\t', '\t' } }, - { VK_ADD, 0, {'+', '+' } }, - { VK_SUBTRACT, 0, {'-', '-' } }, - { VK_MULTIPLY, 0, {'*', '*' } }, - { VK_DIVIDE, 0, {'/', '/' } }, - { VK_ESCAPE, 0, {0x1b, 0x1b} }, - { VK_SPACE, 0, {' ', ' ' } }, + { VK_TAB, 0, { '\t', '\t' } }, + { VK_ADD, 0, { '+', '+' } }, + { VK_SUBTRACT, 0, { '-', '-' } }, + { VK_MULTIPLY, 0, { '*', '*' } }, + { VK_DIVIDE, 0, { '/', '/' } }, + { VK_ESCAPE, 0, { 0x1b, 0x1b } }, + { VK_SPACE, 0, { ' ', ' ' } }, { 0, 0 } }; @@ -207,7 +232,7 @@ { VK_EMPTY, 0, { WCH_NONE, WCH_NONE, WCH_NONE, 0x00b4 } }, // 9 dead letter { '0', 0, { 0x00e9, '0', WCH_NONE, WCH_DEAD } }, // e with acute { VK_EMPTY, 0, { WCH_NONE, WCH_NONE, WCH_NONE, 0x02dd } }, // 0 dead letter - + /* The misc */ { VK_OEM_MINUS, 0, { '=', '%', WCH_NONE, WCH_DEAD } }, // diaeresis { VK_EMPTY, 0, { WCH_NONE, WCH_NONE, WCH_NONE, 0x00a8 } }, // VK_OEM_MINUS dead letter @@ -224,61 +249,45 @@ { VK_OEM_COMMA, 0, { ',', '?', WCH_NONE, '<' } }, { VK_OEM_PERIOD, 0, { '.', ':', WCH_NONE, '>' } }, { VK_OEM_2, 0, { '-', '_', WCH_NONE, '*' } }, - + /* The alphabet */ { 'A', CAPLOK, {'a', 'A', 0x01, WCH_NONE } }, - { 'B', CAPLOK, {'b', 'B', 0x02, '{' } }, - { 'C', CAPLOK, {'c', 'C', 0x03, '&' } }, - { 'D', CAPLOK, {'d', 'D', 0x04, 0x0110 } }, - { 'E', CAPLOK, {'e', 'E', 0x05, 0x20AC } }, - { 'F', CAPLOK, {'f', 'F', 0x06, '[' } }, - { 'G', CAPLOK, {'g', 'G', 0x07, ']' } }, + { 'B', CAPLOK, {'b', 'B', 0x02, '{' } }, + { 'C', CAPLOK, {'c', 'C', 0x03, '&' } }, + { 'D', CAPLOK, {'d', 'D', 0x04, 0x0110 } }, + { 'E', CAPLOK, {'e', 'E', 0x05, 0x20AC } }, + { 'F', CAPLOK, {'f', 'F', 0x06, '[' } }, + { 'G', CAPLOK, {'g', 'G', 0x07, ']' } }, { 'H', CAPLOK, {'h', 'H', 0x08, WCH_NONE } }, { 'I', CAPLOK, {'i', 'I', 0x09, WCH_NONE } }, { 'J', CAPLOK, {'j', 'J', 0x0a, WCH_NONE } }, - { 'K', CAPLOK, {'k', 'K', 0x0b, 0x0142 } }, - { 'L', CAPLOK, {'l', 'L', 0x0c, 0x0141 } }, + { 'K', CAPLOK, {'k', 'K', 0x0b, 0x0142 } }, + { 'L', CAPLOK, {'l', 'L', 0x0c, 0x0141 } }, { 'M', CAPLOK, {'m', 'M', 0x0d, WCH_NONE } }, - { 'N', CAPLOK, {'n', 'N', 0x0e, '}' } }, + { 'N', CAPLOK, {'n', 'N', 0x0e, '}' } }, { 'O', CAPLOK, {'o', 'O', 0x0f, WCH_NONE } }, { 'P', CAPLOK, {'p', 'P', 0x10, WCH_NONE } }, - { 'Q', CAPLOK, {'q', 'Q', 0x11, '\\' } }, + { 'Q', CAPLOK, {'q', 'Q', 0x11, '\\' } }, { 'R', CAPLOK, {'r', 'R', 0x12, WCH_NONE } }, - { 'S', CAPLOK, {'s', 'S', 0x13, WCH_NONE } }, + { 'S', CAPLOK, {'s', 'S', 0x13, 0x0111 } }, { 'T', CAPLOK, {'t', 'T', 0x14, WCH_NONE } }, { 'U', CAPLOK, {'u', 'U', 0x15, WCH_NONE } }, - { 'V', CAPLOK, {'v', 'V', 0x16, '@' } }, - { 'W', CAPLOK, {'w', 'W', 0x17, '|' } }, - { 'X', CAPLOK, {'x', 'X', 0x18, '#' } }, + { 'V', CAPLOK, {'v', 'V', 0x16, '@' } }, + { 'W', CAPLOK, {'w', 'W', 0x17, '|' } }, + { 'X', CAPLOK, {'x', 'X', 0x18, '#' } }, { 'Y', CAPLOK, {'y', 'Y', 0x19, WCH_NONE } }, { 'Z', CAPLOK, {'z', 'Z', 0x1a, WCH_NONE } }, { 0, 0 } }; -ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_NUMPAD0, 0, {'0'} }, - { VK_NUMPAD1, 0, {'1'} }, - { VK_NUMPAD2, 0, {'2'} }, - { VK_NUMPAD3, 0, {'3'} }, - { VK_NUMPAD4, 0, {'4'} }, - { VK_NUMPAD5, 0, {'5'} }, - { VK_NUMPAD6, 0, {'6'} }, - { VK_NUMPAD7, 0, {'7'} }, - { VK_NUMPAD8, 0, {'8'} }, - { VK_NUMPAD9, 0, {'9'} }, - { VK_DECIMAL, 0, {','} }, - { VK_BACK, 0, {'\010'} }, - { 0, 0 } -}; - -#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } +#define vk_master(n, x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { - vk_master(1,keypad_numbers), - vk_master(2,key_to_chars_2mod), - vk_master(3,key_to_chars_3mod), - vk_master(4,key_to_chars_4mod), - { 0,0,0 } + vk_master(1, keypad_numbers), + vk_master(2, key_to_chars_2mod), + vk_master(3, key_to_chars_3mod), + vk_master(4, key_to_chars_4mod), + { 0, 0, 0 } }; ROSDATA VSC_LPWSTR key_names[] = { @@ -348,7 +357,9 @@ { 0x47, L"Home" }, { 0x48, L"Up" }, { 0x49, L"Page Up" }, - { 0x4a, L"Left" }, + /* { 0x4a, L"Left" },*/ + { 0x4a, L"-" }, + { 0x4b, L"Left" }, { 0x4c, L"Center" }, { 0x4d, L"Right" }, { 0x4f, L"End" }, @@ -423,9 +434,9 @@ }; ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x00a1" L"hacek", // caron - L"\x00b4" L"carka", // acute - L"\x005e" L"krouzek", // ring + L"\x00a1" L"hacek", // caron + L"\x00b4" L"carka", // acute + L"\x005e" L"krouzek", // ring NULL }; Modified: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c [iso-8859-1] Mon Jun 2 10:41:52 2014 @@ -78,7 +78,7 @@ VK_SNAPSHOT, /* - 55 - */ /* Oddities, and the remaining standard F-Keys */ - VK_EMPTY, VK_EMPTY, VK_F11, VK_F12, + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, /* - 59 - */ VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ @@ -159,89 +159,21 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, - 7, - { 0, 1, 2, 0, 0, 0, 3, 0 } - /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ -}; - -ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - /* Keys that do not have shift states */ - { VK_TAB, 0, {'\t','\t'} }, - { VK_ADD, 0, {'+', '+'} }, - { VK_SUBTRACT, 0, {'-', '-'} }, - { VK_MULTIPLY, 0, {'*', '*'} }, - { VK_DIVIDE, 0, {'/', '/'} }, - { VK_OEM_2 ,0, {'-', '_'} }, - { VK_ESCAPE, 0, {0x1b,0x1b} }, - { VK_SPACE, 0, {' ', ' '} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - /* normal - shift - ctrl */ - /* The alphabet */ - { 'A', CAPLOK, {'a', 'A', 0x01} }, - { 'B', CAPLOK, {'b', 'B', 0x02} }, - { 'C', CAPLOK, {'c', 'C', 0x03} }, - { 'D', CAPLOK, {'d', 'D', 0x04} }, - { 'F', CAPLOK, {'f', 'F', 0x06} }, - { 'G', CAPLOK, {'g', 'G', 0x07} }, - { 'H', CAPLOK, {'h', 'H', 0x08} }, - { 'I', CAPLOK, {'i', 'I', 0x09} }, - { 'J', CAPLOK, {'j', 'J', 0x0a} }, - { 'K', CAPLOK, {'k', 'K', 0x0b} }, - { 'L', CAPLOK, {'l', 'L', 0x0c} }, - { 'M', CAPLOK, {'m', 'M', 0x0d} }, - { 'N', CAPLOK, {'n', 'N', 0x0e} }, - { 'O', CAPLOK, {'o', 'O', 0x0f} }, - { 'P', CAPLOK, {'p', 'P', 0x10} }, - { 'Q', CAPLOK, {'q', 'Q', 0x11} }, - { 'R', CAPLOK, {'r', 'R', 0x12} }, - { 'S', CAPLOK, {'s', 'S', 0x13} }, - { 'T', CAPLOK, {'t', 'T', 0x14} }, - { 'U', CAPLOK, {'u', 'U', 0x15} }, - { 'V', CAPLOK, {'v', 'V', 0x16} }, - { 'W', CAPLOK, {'w', 'W', 0x17} }, - { 'X', CAPLOK, {'x', 'X', 0x18} }, - { 'Y', CAPLOK, {'y', 'Y', 0x19} }, - { 'Z', CAPLOK, {'z', 'Z', 0x1a} }, - - /* Legacy (telnet-style) ascii escapes */ - { VK_RETURN, 0, {'\r', '\r', '\n'} }, - { 0,0 } -}; - -ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { -/* Normal, shifted, control, Alt+Gr */ - { '1', 0, {'+', '1', WCH_NONE, '!' } }, - { '2', 0, {0x011b, '2', 0, '@' } }, // e with caron - { '3', 0, {0x0161, '3', WCH_NONE, '#' } }, // s with caron - { '4', 0, {0x010d, '4', WCH_NONE, '$' } }, // c with caron - { '5', 0, {0x0159, '5', WCH_NONE, '%' } }, // r with caron - { '6', 0, {0x017e, '6', 0x1e, '^' } }, // z with caron - { '7', 0, {0x00fd, '7', WCH_NONE, '&' } }, // y with acute - { '8', 0, {0x00e1, '8', WCH_NONE, '*' } }, // a with acute - { '9', 0, {0x00ed, '9', WCH_NONE, '(' } }, // i with acute - { '0', 0, {0x00e9, '0', WCH_NONE, ')' } }, // e with acute - { VK_OEM_PLUS, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE, '=' } }, // dead letters - acute, caron - { VK_EMPTY, 0, {0x00b4, 0x02c7, WCH_NONE, WCH_NONE } }, // VK_OEM_PLUS death - { VK_OEM_MINUS, 0, {'=', '%', 0x1f, '-' } }, - { VK_OEM_1, 0, {0x016f, '\"', WCH_NONE, ';' } }, // u with ring - { VK_OEM_7, 0, {0x00a7, '!', WCH_NONE, 0x00a4 } }, // section sign - { VK_OEM_4, 0, {0x00fa, '/', WCH_NONE, '[' } }, // u with acute - { VK_OEM_5, 0, {WCH_DEAD, 0x2018, WCH_NONE, '\\' } }, // diaeresis, left single quotation mark - { VK_EMPTY, 0, {0x00a8, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_5 death - { VK_OEM_6, 0, {')', '(', WCH_NONE, ']' } }, - { VK_OEM_3, 0, {';', WCH_DEAD, WCH_NONE, '`' } }, // ring - { VK_EMPTY, 0, {WCH_NONE, 0x00b0, WCH_NONE, WCH_NONE } }, // VK_OEM_3 death - { VK_OEM_COMMA, 0, {',', '?', WCH_NONE, '<' } }, - { VK_OEM_PERIOD, 0, {'.', ':', WCH_NONE, '>' } }, - { 'E', CAPLOK, {'e', 'E', 0x05, 0x20AC } }, // symbol for euro (currency) - { 0, 0 } -}; + 7, /* Modifier bit order */ + { + 0, /* NONE */ + 1, /* SHIFT */ + 2, /* CTRL */ + 0, /* SHIFT-CTRL (not used) */ + 0, /* ALT (not used) */ + 0, /* SHIFT-ALT (not used) */ + 3, /* CTRL-ALT */ + 4, /* SHIFT-CTRL-ALT */ + } +}; +/* ^ This table shows which column in any VK_TO_WCHARS* structure will be used on which modifier */ ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_DECIMAL, 0, {','} }, { VK_NUMPAD0, 0, {'0'} }, { VK_NUMPAD1, 0, {'1'} }, { VK_NUMPAD2, 0, {'2'} }, @@ -252,18 +184,103 @@ { VK_NUMPAD7, 0, {'7'} }, { VK_NUMPAD8, 0, {'8'} }, { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {','} }, { VK_BACK, 0, {'\010'} }, { 0, 0 } }; -#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Keys that do not have shift states */ + { VK_TAB, 0, { '\t', '\t' } }, + { VK_ADD, 0, { '+', '+' } }, + { VK_SUBTRACT, 0, { '-', '-' } }, + { VK_MULTIPLY, 0, { '*', '*' } }, + { VK_DIVIDE, 0, { '/', '/' } }, + { VK_ESCAPE, 0, { 0x1b, 0x1b } }, + { VK_SPACE, 0, { ' ', ' ' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* normal - shift - ctrl */ + + /* Legacy (telnet-style) ascii escapes */ + { VK_RETURN, 0, {'\r', '\r', '\n' } }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { +/* Normal, shifted, control, Alt+Gr, Sh+Alt+Gr */ + + /* The numbers */ + { '1', 0, { '+', '1', WCH_NONE, '!', WCH_NONE } }, + { '2', 0, { 0x011b, '2', 0, '@', WCH_NONE } }, // e with caron + { '3', 0, { 0x0161, '3', WCH_NONE, '#', WCH_NONE } }, // s with caron + { '4', 0, { 0x010d, '4', WCH_NONE, '$', WCH_NONE } }, // c with caron + { '5', 0, { 0x0159, '5', WCH_NONE, '%', WCH_NONE } }, // r with caron + { '6', 0, { 0x017e, '6', 0x1e, '^', WCH_NONE } }, // z with caron + { '7', 0, { 0x00fd, '7', WCH_NONE, '&', WCH_NONE } }, // y with acute + { '8', 0, { 0x00e1, '8', WCH_NONE, '*', WCH_NONE } }, // a with acute + { '9', 0, { 0x00ed, '9', WCH_NONE, '(', WCH_NONE } }, // i with acute + { '0', 0, { 0x00e9, '0', WCH_NONE, ')', WCH_NONE } }, // e with acute + + /* The misc */ + { VK_OEM_PLUS, 0, { WCH_DEAD, WCH_DEAD, WCH_NONE, '=', '+' } }, // dead letters - acute, caron + { VK_EMPTY, 0, { 0x00b4, 0x02c7, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_PLUS dead letter + { VK_OEM_MINUS, 0, { '=', '%', 0x1f, '-', '_' } }, + { VK_OEM_1, 0, { 0x016f, '\"', WCH_NONE, ';', ':' } }, // u with ring + { VK_OEM_7, 0, { 0x00a7, '!', WCH_NONE, 0x00a4, WCH_DEAD } }, // section sign, currency sign + { VK_EMPTY, 0, { WCH_NONE, WCH_NONE, WCH_NONE, WCH_NONE, '^' } }, // VK_OEM_7 dead letter + { VK_OEM_4, 0, { 0x00fa, '/', WCH_NONE, '[', '{' } }, // u with acute + { VK_OEM_5, 0, { WCH_DEAD, 0x2018, WCH_NONE, '\\', '|' } }, // diaeresis, left single quotation mark + { VK_EMPTY, 0, { 0x00a8, WCH_NONE, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_5 dead letter + { VK_OEM_6, 0, { ')', '(', WCH_NONE, ']', '}' } }, + { VK_OEM_3, 0, { ';', WCH_DEAD, WCH_NONE, '`', '~' } }, // ring + { VK_EMPTY, 0, { WCH_NONE, 0x00b0, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_3 dead letter + { VK_OEM_COMMA, 0, { ',', '?', WCH_NONE, '<', 0x00d7 } }, // multiplication sign + { VK_OEM_PERIOD, 0, { '.', ':', WCH_NONE, '>', 0x00f7 } }, // division sign + { VK_OEM_2, 0, { '-', '_', WCH_NONE, '/', '?' } }, + { VK_OEM_102, 0, { '\\', '|', 0x1c/*FS*/, 0x00df, WCH_DEAD } }, // sharp s, double acute accent + { VK_EMPTY, 0, { WCH_NONE, WCH_NONE, WCH_NONE, WCH_NONE, 0x02dd } }, // VK_OEM_102 dead letter + + /* The alphabet */ + { 'A', CAPLOK, { 'a', 'A', 0x01, WCH_NONE, WCH_NONE } }, + { 'B', CAPLOK, { 'b', 'B', 0x02, WCH_NONE, WCH_NONE } }, + { 'C', CAPLOK, { 'c', 'C', 0x03, WCH_NONE, WCH_NONE } }, + { 'D', CAPLOK, { 'd', 'D', 0x04, WCH_NONE, WCH_NONE } }, + { 'E', CAPLOK, { 'e', 'E', 0x05, 0x20AC, WCH_NONE } }, // symbol for euro (currency) + { 'F', CAPLOK, { 'f', 'F', 0x06, WCH_NONE, WCH_NONE } }, + { 'G', CAPLOK, { 'g', 'G', 0x07, WCH_NONE, WCH_NONE } }, + { 'H', CAPLOK, { 'h', 'H', 0x08, WCH_NONE, WCH_NONE } }, + { 'I', CAPLOK, { 'i', 'I', 0x09, WCH_NONE, WCH_NONE } }, + { 'J', CAPLOK, { 'j', 'J', 0x0a, WCH_NONE, WCH_NONE } }, + { 'K', CAPLOK, { 'k', 'K', 0x0b, WCH_NONE, WCH_NONE } }, + { 'L', CAPLOK, { 'l', 'L', 0x0c, WCH_NONE, WCH_NONE } }, + { 'M', CAPLOK, { 'm', 'M', 0x0d, WCH_NONE, WCH_NONE } }, + { 'N', CAPLOK, { 'n', 'N', 0x0e, WCH_NONE, WCH_NONE } }, + { 'O', CAPLOK, { 'o', 'O', 0x0f, WCH_NONE, WCH_NONE } }, + { 'P', CAPLOK, { 'p', 'P', 0x10, WCH_NONE, WCH_NONE } }, + { 'Q', CAPLOK, { 'q', 'Q', 0x11, WCH_NONE, WCH_NONE } }, + { 'R', CAPLOK, { 'r', 'R', 0x12, WCH_NONE, WCH_NONE } }, + { 'S', CAPLOK, { 's', 'S', 0x13, WCH_NONE, WCH_NONE } }, + { 'T', CAPLOK, { 't', 'T', 0x14, WCH_NONE, WCH_NONE } }, + { 'U', CAPLOK, { 'u', 'U', 0x15, WCH_NONE, WCH_NONE } }, + { 'V', CAPLOK, { 'v', 'V', 0x16, WCH_NONE, WCH_NONE } }, + { 'W', CAPLOK, { 'w', 'W', 0x17, WCH_NONE, WCH_NONE } }, + { 'X', CAPLOK, { 'x', 'X', 0x18, WCH_NONE, WCH_NONE } }, + { 'Y', CAPLOK, { 'y', 'Y', 0x19, WCH_NONE, WCH_NONE } }, + { 'Z', CAPLOK, { 'z', 'Z', 0x1a, WCH_NONE, WCH_NONE } }, + { 0, 0 } +}; + +#define vk_master(n, x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { - vk_master(1,keypad_numbers), - vk_master(2,key_to_chars_2mod), - vk_master(3,key_to_chars_3mod), - vk_master(4,key_to_chars_4mod), - { 0,0,0 } + vk_master(1, keypad_numbers), + vk_master(2, key_to_chars_2mod), + vk_master(3, key_to_chars_3mod), + vk_master(5, key_to_chars_5mod), + { 0, 0, 0 } }; ROSDATA VSC_LPWSTR key_names[] = { @@ -333,7 +350,9 @@ { 0x47, L"Home" }, { 0x48, L"Up" }, { 0x49, L"Page Up" }, - { 0x4a, L"Left" }, + /* { 0x4a, L"Left" },*/ + { 0x4a, L"-" }, + { 0x4b, L"Left" }, { 0x4c, L"Center" }, { 0x4d, L"Right" }, { 0x4f, L"End" }, @@ -401,16 +420,16 @@ { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u with diaeresis { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // space > diaeresis - { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with round - { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with round - { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > round + { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with ring + { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with ring + { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > ring { 0, 0, 0 }, }; ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x00a1" L"hacek", // caron - L"\x00b4" L"carka", // acute - L"\x005e" L"krouzek", // round + L"\x00a1" L"hacek", // caron + L"\x00b4" L"carka", // acute + L"\x005e" L"krouzek", // ring NULL }; @@ -422,7 +441,7 @@ /* character from vk tables */ vk_to_wchar_master_table, - /* diacritical marks -- */ + /* diacritical marks */ dead_key, /* Key names */ @@ -447,4 +466,3 @@ PKBDTABLES WINAPI KbdLayerDescriptor(VOID) { return &keyboard_layout_table; } -

10 years, 6 months

[jimtabor] 63531: [User32] - Fix recursive loops during Alt+Esc and Tab. Dedicated to Hermès Bélusca-Maïto.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jun 1 22:32:24 2014 New Revision: 63531 URL: http://svn.reactos.org/svn/reactos?rev=63531&view=rev Log: [User32] - Fix recursive loops during Alt+Esc and Tab. Dedicated to Hermès Bélusca-Maïto. Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] Sun Jun 1 22:32:24 2014 @@ -17,7 +17,7 @@ #define MAX_WINDOWS 120 // Global variables -HWND switchdialog; +HWND switchdialog = NULL; HFONT dialogFont; int selectedWindow = 0; BOOL isOpen = FALSE; @@ -334,19 +334,26 @@ LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam ) { - HWND hwnd; + HWND hwnd, hwndActive; MSG msg; BOOL Esc = FALSE; INT Count = 0; WCHAR Text[1024]; - switchdialog = NULL; + // Already in the loop. + if (switchdialog) return 0; + + hwndActive = GetActiveWindow(); + // Nothing is active so exit. + if (!hwndActive) return 0; + // Capture current active window. + SetCapture( hwndActive ); switch (lParam) { case VK_TAB: - if( !CreateSwitcherWindow(User32Instance) ) return 0; - if( !GetDialogFont() ) return 0; + if( !CreateSwitcherWindow(User32Instance) ) goto Exit; + if( !GetDialogFont() ) goto Exit; ProcessHotKey(); break; @@ -354,7 +361,7 @@ windowCount = 0; Count = 0; EnumWindowsZOrder(EnumerateCallback, 0); - if (windowCount < 2) return 0; + if (windowCount < 2) goto Exit; if (wParam == SC_NEXTWINDOW) Count = 1; else @@ -373,7 +380,7 @@ break; default: - return 0; + goto Exit; } // Main message loop: while (1) @@ -471,6 +478,7 @@ } } Exit: + ReleaseCapture(); if (switchdialog) DestroyWindow(switchdialog); switchdialog = NULL; selectedWindow = 0;

10 years, 6 months

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 June 2014