Ros-diffs July 2016

ros-diffs@reactos.org

18 participants
358 discussions

[pschweitzer] 72056: [FASTFAT] Fix a FIXME
by pschweitzer＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: pschweitzer Date: Sat Jul 30 12:53:09 2016 New Revision: 72056 URL: http://svn.reactos.org/svn/reactos?rev=72056&view=rev Log: [FASTFAT] Fix a FIXME Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Jul 30 12:53:09 2016 @@ -445,7 +445,6 @@ Status = VfatMountDevice(DeviceExt, DeviceToMount); if (!NT_SUCCESS(Status)) { - /* FIXME: delete device object */ goto ByeBye; }

1 0

[gadamopoulos] 72055: [BROWSEUI] - Move handling of DISPID_NAVIGATECOMPLETE2 event from CAddressBand to CAddressEditBox as the todo comments say it should be. - Remove the todo entries that are com...
by gadamopoulos＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: gadamopoulos Date: Sat Jul 30 12:47:39 2016 New Revision: 72055 URL: http://svn.reactos.org/svn/reactos?rev=72055&view=rev Log: [BROWSEUI] - Move handling of DISPID_NAVIGATECOMPLETE2 event from CAddressBand to CAddressEditBox as the todo comments say it should be. - Remove the todo entries that are complete. - Remove IDispatch from CAddressBand as it is not really needed. Now CAddressBand takes care only of positioning and handling the button while CAddressEditBox does all the parsing and interaction with the browser. Modified: trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/addressband.h trunk/reactos/dll/win32/browseui/addresseditbox.cpp Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Sat Jul 30 12:47:39 2016 @@ -29,11 +29,8 @@ /* TODO: -****Add command handler for show/hide Go button to OnWinEvent ****Add tooltip notify handler **Properly implement GetBandInfo - **Add correct text to Go button - **Implement TranslateAcceleratorIO Implement Exec Implement QueryService Implement Load @@ -46,7 +43,6 @@ fGoButton = NULL; fComboBox = NULL; fGoButtonShown = false; - fAdviseCookie = 0; } CAddressBand::~CAddressBand() @@ -103,7 +99,6 @@ HRESULT STDMETHODCALLTYPE CAddressBand::SetSite(IUnknown *pUnkSite) { - CComPtr<IBrowserService> browserService; CComPtr<IShellService> shellService; HWND parentWindow; HWND combobox; @@ -112,7 +107,6 @@ if (pUnkSite == NULL) { - hResult = AtlUnadvise(fSite, DIID_DWebBrowserEvents, fAdviseCookie); fSite.Release(); return S_OK; } @@ -170,13 +164,6 @@ fGoButtonShown = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); if (fGoButtonShown) CreateGoButton(); - - // take advice to watch events - hResult = IUnknown_QueryService(pUnkSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); - if (SUCCEEDED(hResult)) - { - hResult = AtlAdvise(browserService, static_cast<IDispatch *>(this), DIID_DWebBrowserEvents, &fAdviseCookie); - } return hResult; } @@ -398,108 +385,6 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CAddressBand::GetTypeInfoCount(UINT *pctinfo) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CAddressBand::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CAddressBand::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CAddressBand::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, - DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - CComPtr<IBrowserService> isb; - CComPtr<IShellFolder> sf; - HRESULT hr; - INT indexClosed, indexOpen, itemExists, oldIndex; - DWORD result; - COMBOBOXEXITEMW item; - PIDLIST_ABSOLUTE absolutePIDL; - LPCITEMIDLIST pidlChild; - LPITEMIDLIST pidlPrevious; - STRRET ret; - WCHAR buf[4096]; - - if (pDispParams == NULL) - return E_INVALIDARG; - - switch (dispIdMember) - { - case DISPID_NAVIGATECOMPLETE2: - case DISPID_DOCUMENTCOMPLETE: - - oldIndex = SendMessage(m_hWnd, CB_GETCURSEL, 0, 0); - - itemExists = FALSE; - pidlPrevious = NULL; - - ZeroMemory(&item, sizeof(item)); - item.mask = CBEIF_LPARAM; - item.iItem = 0; - if (SendMessage(m_hWnd, CBEM_GETITEM, 0, reinterpret_cast<LPARAM>(&item))) - { - pidlPrevious = reinterpret_cast<LPITEMIDLIST>(item.lParam); - if (pidlPrevious) - itemExists = TRUE; - } - - hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - isb->GetPidl(&absolutePIDL); - - SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); - - sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); - - StrRetToBufW(&ret, pidlChild, buf, 4095); - - indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); - - item.mask = CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_TEXT | CBEIF_LPARAM; - item.iItem = 0; - item.iImage = indexClosed; - item.iSelectedImage = indexOpen; - item.pszText = buf; - item.lParam = reinterpret_cast<LPARAM>(absolutePIDL); - - if (itemExists) - { - result = SendMessage(m_hWnd, CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); - oldIndex = 0; - - if (result) - { - ILFree(pidlPrevious); - } - } - else - { - oldIndex = SendMessage(m_hWnd, CBEM_INSERTITEM, 0, reinterpret_cast<LPARAM>(&item)); - - if (oldIndex < 0) - DbgPrint("ERROR %d\n", GetLastError()); - } - - SendMessage(m_hWnd, CB_SETCURSEL, -1, 0); - SendMessage(m_hWnd, CB_SETCURSEL, oldIndex, 0); - - //fAddressEditBox->SetCurrentDir(index); - - break; - } - return S_OK; -} - LRESULT CAddressBand::OnNotifyClick(WPARAM wParam, NMHDR *notifyHeader, BOOL &bHandled) { if (notifyHeader->hwndFrom == fGoButton) Modified: trunk/reactos/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] Sat Jul 30 12:47:39 2016 @@ -32,8 +32,7 @@ public IServiceProvider, public IWinEventHandler, public IAddressBand, - public IInputObjectSite, - public IDispatch + public IInputObjectSite { private: CComPtr<IDockingWindowSite> fSite; @@ -42,7 +41,6 @@ HWND fGoButton; HWND fComboBox; bool fGoButtonShown; - DWORD fAdviseCookie; public: CAddressBand(); virtual ~CAddressBand(); @@ -98,12 +96,6 @@ virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty); virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); - // *** IDispatch methods *** - virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT *pctinfo); - virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); - virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); - virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); - // message handlers LRESULT OnNotifyClick(WPARAM wParam, NMHDR *notifyHeader, BOOL &bHandled); LRESULT OnTipText(UINT idControl, NMHDR *notifyHeader, BOOL &bHandled); @@ -137,6 +129,5 @@ COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Sat Jul 30 12:47:39 2016 @@ -26,17 +26,10 @@ /* TODO: - Add auto completion support - Subclass windows in Init method - Connect to browser connection point - Handle navigation complete messages to set edit box text Handle listbox dropdown message and fill contents Add drag and drop of icon in edit box - Handle enter in edit box to browse to typed path Handle change notifies to update appropriately - Add handling of enter in edit box Fix so selection in combo listbox navigates - Fix so editing text and typing enter navigates */ CAddressEditBox::CAddressEditBox() : @@ -291,6 +284,18 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { + CComPtr<IBrowserService> isb; + CComPtr<IShellFolder> sf; + HRESULT hr; + INT indexClosed, indexOpen, itemExists, oldIndex; + DWORD result; + COMBOBOXEXITEMW item; + PIDLIST_ABSOLUTE absolutePIDL; + LPCITEMIDLIST pidlChild; + LPITEMIDLIST pidlPrevious; + STRRET ret; + WCHAR buf[4096]; + if (pDispParams == NULL) return E_INVALIDARG; @@ -299,6 +304,64 @@ case DISPID_NAVIGATECOMPLETE2: case DISPID_DOCUMENTCOMPLETE: pidlLastParsed = NULL; + + oldIndex = fCombobox.SendMessage(CB_GETCURSEL, 0, 0); + + itemExists = FALSE; + pidlPrevious = NULL; + + ZeroMemory(&item, sizeof(item)); + item.mask = CBEIF_LPARAM; + item.iItem = 0; + if (fCombobox.SendMessage(CBEM_GETITEM, 0, reinterpret_cast<LPARAM>(&item))) + { + pidlPrevious = reinterpret_cast<LPITEMIDLIST>(item.lParam); + if (pidlPrevious) + itemExists = TRUE; + } + + hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + isb->GetPidl(&absolutePIDL); + + SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + + sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); + + StrRetToBufW(&ret, pidlChild, buf, 4095); + + indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); + + item.mask = CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_TEXT | CBEIF_LPARAM; + item.iItem = 0; + item.iImage = indexClosed; + item.iSelectedImage = indexOpen; + item.pszText = buf; + item.lParam = reinterpret_cast<LPARAM>(absolutePIDL); + + if (itemExists) + { + result = fCombobox.SendMessage(CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); + oldIndex = 0; + + if (result) + { + ILFree(pidlPrevious); + } + } + else + { + oldIndex = fCombobox.SendMessage(CBEM_INSERTITEM, 0, reinterpret_cast<LPARAM>(&item)); + + if (oldIndex < 0) + DbgPrint("ERROR %d\n", GetLastError()); + } + + fCombobox.SendMessage(CB_SETCURSEL, -1, 0); + fCombobox.SendMessage(CB_SETCURSEL, oldIndex, 0); + + //fAddressEditBox->SetCurrentDir(index); } return S_OK; }

1 0

[jimtabor] 72054: [NtUser] - Fix hang while inputting mouse message. Fix CORE-9998.
by jimtabor＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: jimtabor Date: Sat Jul 30 12:32:28 2016 New Revision: 72054 URL: http://svn.reactos.org/svn/reactos?rev=72054&view=rev Log: [NtUser] - Fix hang while inputting mouse message. Fix CORE-9998. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Jul 30 12:32:28 2016 @@ -1891,6 +1891,16 @@ return 1; } +/* check whether message is in the range of mouse messages */ +static inline BOOL is_mouse_message( UINT message ) +{ + return ( //( message >= WM_NCMOUSEFIRST && message <= WM_NCMOUSELAST ) || This seems to break tests... + ( message >= WM_MOUSEFIRST && message <= WM_MOUSELAST ) || + ( message >= WM_XBUTTONDOWN && message <= WM_XBUTTONDBLCLK ) || + ( message >= WM_MBUTTONDOWN && message <= WM_MBUTTONDBLCLK ) || + ( message >= WM_LBUTTONDOWN && message <= WM_RBUTTONDBLCLK ) ); +} + BOOL APIENTRY co_MsqPeekHardwareMessage(IN PTHREADINFO pti, IN BOOL Remove, @@ -1946,7 +1956,7 @@ if ( ( !Window || // 1 ( Window == PWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 ( Window != PWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) || // 3 - ( CurrentMessage->Msg.message == WM_MOUSEMOVE ) ) && // Null window for mouse moves. + ( is_mouse_message(CurrentMessage->Msg.message) ) ) && // Null window for anything mouse. ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) {

1 0

[gadamopoulos] 72053: [BROWSEUI] - Use the _CreateInstance postfix for all functions that instantiate a class. - Move the the CreateInstance functions of the exported classes to browseui.h where we...
by gadamopoulos＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: gadamopoulos Date: Sat Jul 30 11:53:16 2016 New Revision: 72053 URL: http://svn.reactos.org/svn/reactos?rev=72053&view=rev Log: [BROWSEUI] - Use the _CreateInstance postfix for all functions that instantiate a class. - Move the the CreateInstance functions of the exported classes to browseui.h where we can select uniformly which built in classes we use. Added: trunk/reactos/dll/win32/browseui/browseui.h (with props) Modified: trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/addresseditbox.cpp trunk/reactos/dll/win32/browseui/bandproxy.cpp trunk/reactos/dll/win32/browseui/basebar.cpp trunk/reactos/dll/win32/browseui/basebarsite.cpp trunk/reactos/dll/win32/browseui/brandband.cpp trunk/reactos/dll/win32/browseui/explorerband.cpp trunk/reactos/dll/win32/browseui/explorerband.h trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/internettoolbar.h trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/dll/win32/browseui/toolsband.cpp trunk/reactos/dll/win32/browseui/travellog.cpp Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -27,8 +27,6 @@ #include <shlwapi_undoc.h> #include <shellapi.h> -HRESULT CreateAddressEditBox(REFIID riid, void **ppv); - /* TODO: ****Add command handler for show/hide Go button to OnWinEvent @@ -155,19 +153,9 @@ fEditControl = reinterpret_cast<HWND>(SendMessage(CBEM_GETEDITCONTROL, 0, 0)); fComboBox = reinterpret_cast<HWND>(SendMessage(CBEM_GETCOMBOCONTROL, 0, 0)); -#if 1 - hResult = CoCreateInstance(CLSID_AddressEditBox, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IAddressEditBox, &fAddressEditBox)); -#else - hResult = E_FAIL; -#endif - if (FAILED_UNEXPECTEDLY(hResult)) - { - // instantiate new version - hResult = CreateAddressEditBox(IID_PPV_ARG(IAddressEditBox, &fAddressEditBox)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - } + hResult = CAddressEditBox_CreateInstance(IID_PPV_ARG(IAddressEditBox, &fAddressEditBox)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IShellService, &shellService)); if (FAILED_UNEXPECTEDLY(hResult)) @@ -642,11 +630,6 @@ return 0; } -HRESULT CreateAddressBand(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CAddressBand>(riid, ppv); -} - void CAddressBand::CreateGoButton() { const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -330,8 +330,3 @@ { return E_NOTIMPL; } - -HRESULT CreateAddressEditBox(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CAddressEditBox>(riid, ppv); -} Modified: trunk/reactos/dll/win32/browseui/bandproxy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandpro… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandproxy.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandproxy.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -125,8 +125,3 @@ { return E_NOTIMPL; } - -HRESULT CreateBandProxy(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CBandProxy>(riid, ppv); -} Modified: trunk/reactos/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -548,7 +548,7 @@ return 0; } -HRESULT CreateBaseBar(REFIID riid, void **ppv, BOOL vertical) +HRESULT CBaseBar_CreateInstance(REFIID riid, void **ppv, BOOL vertical) { return ShellObjectCreatorInit<CBaseBar, BOOL>(vertical, riid, ppv); } Modified: trunk/reactos/dll/win32/browseui/basebarsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -830,7 +830,7 @@ return S_OK; } -HRESULT CreateBaseBarSite(REFIID riid, void **ppv, BOOL bVertical) +HRESULT CBaseBarSite_CreateInstance(REFIID riid, void **ppv, BOOL bVertical) { return ShellObjectCreatorInit<CBaseBarSite, BOOL>(bVertical, riid, ppv); } Modified: trunk/reactos/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandba… ============================================================================== --- trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -456,8 +456,3 @@ Invalidate(FALSE); return 0; } - -HRESULT CreateBrandBand(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CBrandBand>(riid, ppv); -} Added: trunk/reactos/dll/win32/browseui/browseui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.h (added) +++ trunk/reactos/dll/win32/browseui/browseui.h [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -0,0 +1,122 @@ +#pragma once + +#define USE_CUSTOM_MENUBAND 1 +#define USE_CUSTOM_MERGEDFOLDER 1 +#define USE_CUSTOM_ADDRESSBAND 1 +#define USE_CUSTOM_ADDRESSEDITBOX 1 +#define USE_CUSTOM_BANDPROXY 1 +#define USE_CUSTOM_BRANDBAND 1 +#define USE_CUSTOM_EXPLORERBAND 1 +#define USE_CUSTOM_INTERNETTOOLBAR 1 + +/* Constructors for the classes that are not exported */ +HRESULT CTravelLog_CreateInstance(REFIID riid, void **ppv); +HRESULT CBaseBar_CreateInstance(REFIID riid, void **ppv, BOOL vertical); +HRESULT CBaseBarSite_CreateInstance(REFIID riid, void **ppv, BOOL bVertical); +HRESULT CToolsBand_CreateInstance(REFIID riid, void **ppv); + +static inline +HRESULT CAddressBand_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_ADDRESSBAND + return ShellObjectCreator<CAddressBand>(riid, ppv); +#else + return CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, toolsBar)); +#endif +} + +static inline +HRESULT CAddressEditBox_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_ADDRESSEDITBOX + return ShellObjectCreator<CAddressEditBox>(riid, ppv); +#else + return CoCreateInstance(CLSID_AddressEditBox, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(riid, &ppv)); +#endif +} + +static inline +HRESULT CBandProxy_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_BANDPROXY + return ShellObjectCreator<CBandProxy>(riid, ppv); +#else + return CoCreateInstance(CLSID_BandProxy, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(riid, &ppv)); +#endif +} + +static inline +HRESULT CBrandBand_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_BRANDBAND + return ShellObjectCreator<CBrandBand>(riid, ppv); +#else + return CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, riid, ppv); +#endif +} + +static inline +HRESULT WINAPI CExplorerBand_CreateInstance(REFIID riid, LPVOID *ppv) +{ +#if USE_CUSTOM_EXPLORERBAND + return ShellObjectCreator<CExplorerBand>(riid, ppv); +#else + return CoCreateInstance(CLSID_ExplorerBand, NULL, CLSCTX_INPROC_SERVER, riid, ppv); +#endif +} + +static inline +HRESULT CInternetToolbar_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_INTERNETTOOLBAR + return ShellObjectCreator<CInternetToolbar>(riid, ppv); +#else + return CoCreateInstance(CLSID_InternetToolbar, NULL, CLSCTX_INPROC_SERVER, riid, ppv); +#endif +} + +typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); + +static inline +HRESULT CMergedFolder_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_MERGEDFOLDER + HMODULE hRShell = GetModuleHandle(L"rshell.dll"); + if (!hRShell) + hRShell = LoadLibrary(L"rshell.dll"); + + if (hRShell) + { + PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) + GetProcAddress(hRShell, "CMergedFolder_Constructor"); + + if (pCMergedFolder_Constructor) + { + return pCMergedFolder_Constructor(riid, ppv); + } + } +#endif + return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv); +} + +static inline +HRESULT CMenuBand_CreateInstance(REFIID iid, LPVOID *ppv) +{ +#if USE_CUSTOM_MENUBAND + HMODULE hRShell = GetModuleHandleW(L"rshell.dll"); + + if (!hRShell) + hRShell = LoadLibraryW(L"rshell.dll"); + + if (hRShell) + { + PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); + if (func) + { + return func(iid , ppv); + } + } +#endif + return CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, iid, ppv); +} Propchange: trunk/reactos/dll/win32/browseui/browseui.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -27,12 +27,6 @@ #define UNIMPLEMENTED DbgPrint("%s is UNIMPLEMENTED!\n", __FUNCTION__) #endif - -extern "C" -HRESULT WINAPI CExplorerBand_Constructor(REFIID riid, LPVOID *ppv) -{ - return ShellObjectCreator<CExplorerBand>(riid, ppv); -} CExplorerBand::CExplorerBand() : pSite(NULL), fVisible(FALSE), bNavigating(FALSE), dwBandID(0) Modified: trunk/reactos/dll/win32/browseui/explorerband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -184,6 +184,3 @@ MESSAGE_HANDLER(WM_RBUTTONDOWN, ContextMenuHack) END_MSG_MAP() }; - -extern "C" -HRESULT WINAPI CExplorerBand_Constructor(REFIID riid, LPVOID *ppv); Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -78,10 +78,6 @@ */ extern HRESULT WINAPI SHBindToFolder(LPCITEMIDLIST path, IShellFolder **newFolder); -extern HRESULT CreateToolsBar(REFIID riid, void **ppv); -extern HRESULT CreateBrandBand(REFIID riid, void **ppv); -extern HRESULT CreateBandProxy(REFIID riid, void **ppv); -extern HRESULT CreateAddressBand(REFIID riid, void **ppv); HRESULT IUnknown_RelayWinEvent(IUnknown * punk, HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { @@ -442,7 +438,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = CreateMergedFolder(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); + hr = CMergedFolder_CreateInstance(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); if (FAILED_UNEXPECTEDLY(hr)) { *ppsfFavorites = psfUserFavorites.Detach(); @@ -503,7 +499,7 @@ if (fFavoritesMenu.p == NULL) { - hResult = CreateMenuBand(IID_PPV_ARG(IShellMenu, &newMenu)); + hResult = CMenuBand_CreateInstance(IID_PPV_ARG(IShellMenu, &newMenu)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = newMenu->Initialize(this, FCIDM_MENU_FAVORITES, -1, SMINIT_VERTICAL | SMINIT_CACHED); @@ -671,7 +667,7 @@ *pMenuBar = NULL; - hResult = CreateMenuBand(IID_PPV_ARG(IShellMenu, &menubar)); + hResult = CMenuBand_CreateInstance(IID_PPV_ARG(IShellMenu, &menubar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -717,29 +713,6 @@ *pMenuBar = menubar.Detach(); return S_OK; -} - -HRESULT CInternetToolbar::CreateBrandBand(IUnknown **logoBar) -{ -#if 1 - return ::CreateBrandBand(IID_PPV_ARG(IUnknown, logoBar)); -#else - return CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, logoBar)); -#endif -} - -HRESULT CInternetToolbar::CreateToolsBar(IUnknown **toolsBar) -{ - return ::CreateToolsBar(IID_PPV_ARG(IUnknown, toolsBar)); -} - -HRESULT CInternetToolbar::CreateAddressBand(IUnknown **toolsBar) -{ -#if 1 - return ::CreateAddressBand(IID_PPV_ARG(IUnknown, toolsBar)); -#else - return CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, toolsBar)); -#endif } HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) @@ -817,7 +790,7 @@ hResult = serviceProvider->QueryService(SID_IBandProxy, IID_PPV_ARG(IBandProxy, &fBandProxy)); if (FAILED_UNEXPECTEDLY(hResult)) { - hResult = CreateBandProxy(IID_PPV_ARG(IBandProxy, &fBandProxy)); + hResult = CBandProxy_CreateInstance(IID_PPV_ARG(IBandProxy, &fBandProxy)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = fBandProxy->SetSite(fSite); @@ -1048,7 +1021,7 @@ // and it will put them in their own row, sized to take up the whole row. #if 0 /* Create and attach the brand/logo to the rebar */ - hResult = CreateBrandBand(&logoBar); + hResult = CBrandBand_CreateInstance(IID_PPV_ARG(IUnknown, &logoBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; AddDockItem(logoBar, ITBBID_BRANDBAND, CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE); @@ -1056,7 +1029,7 @@ #endif /* Create and attach the standard toolbar to the rebar */ - hResult = CreateToolsBar(&toolsBar); + hResult = CToolsBand_CreateInstance(IID_PPV_ARG(IUnknown, &toolsBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); @@ -1066,7 +1039,7 @@ return hResult; /* Create and attach the address/navigation toolbar to the rebar */ - hResult = CreateAddressBand(&navigationBar); + hResult = CAddressBand_CreateInstance(IID_PPV_ARG(IUnknown, &navigationBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); @@ -1875,7 +1848,3 @@ return 0; } -HRESULT CreateInternetToolbar(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CInternetToolbar>(riid, ppv); -} Modified: trunk/reactos/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -98,9 +98,7 @@ void AddDockItem(IUnknown *newItem, int bandID, int flags); HRESULT ReserveBorderSpace(LONG maxHeight = -1); HRESULT CreateMenuBar(IShellMenu **menuBar); - HRESULT CreateBrandBand(IUnknown **logoBar); HRESULT CreateToolsBar(IUnknown **toolsBar); - HRESULT CreateAddressBand(IUnknown **toolsBar); HRESULT LockUnlockToolbars(bool locked); HRESULT CommandStateChanged(bool newValue, int commandID); HRESULT CreateAndInitBandProxy(); Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -49,57 +49,9 @@ #include "regtreeoptions.h" #include "explorerband.h" #include "CProgressDialog.h" +#include "browseui.h" #include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(browseui); - -#define USE_CUSTOM_MENUBAND 1 - -typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); -typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); - -static inline -HRESULT CreateMergedFolder(REFIID riid, void **ppv) -{ -#if 1 - HMODULE hRShell = GetModuleHandle(L"rshell.dll"); - if (!hRShell) - hRShell = LoadLibrary(L"rshell.dll"); - - if (hRShell) - { - PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) - GetProcAddress(hRShell, "CMergedFolder_Constructor"); - - if (pCMergedFolder_Constructor) - { - return pCMergedFolder_Constructor(riid, ppv); - } - } -#endif - return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv); -} - -static inline -HRESULT CreateMenuBand(REFIID iid, LPVOID *ppv) -{ -#if USE_CUSTOM_MENUBAND - HMODULE hRShell = GetModuleHandleW(L"rshell.dll"); - - if (!hRShell) - hRShell = LoadLibraryW(L"rshell.dll"); - - if (hRShell) - { - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); - if (func) - { - return func(iid , ppv); - } - } -#endif - return CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, iid, ppv); -} - #endif /* _BROWSEUI_PCH_ */ Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -23,8 +23,6 @@ #include <shellapi.h> #include <htiframe.h> #include <strsafe.h> - -#define USE_CUSTOM_EXPLORERBAND 1 extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); @@ -128,14 +126,6 @@ // this class is private to browseui.dll and is not registered externally? //DEFINE_GUID(CLSID_ShellFldSetExt, 0x6D5313C0, 0x8C62, 0x11D1, 0xB2, 0xCD, 0x00, 0x60, 0x97, 0xDF, 0x8C, 0x11); - - -extern HRESULT CreateTravelLog(REFIID riid, void **ppv); -extern HRESULT CreateBaseBar(REFIID riid, void **ppv, BOOL vertical); -extern HRESULT CreateBaseBarSite(REFIID riid, void **ppv, BOOL vertical); - -// temporary -extern HRESULT CreateInternetToolbar(REFIID riid, void **ppv); void DeleteMenuItems(HMENU theMenu, unsigned int firstIDToDelete, unsigned int lastIDToDelete) { @@ -325,7 +315,7 @@ HRESULT BrowseToPath(IShellFolder *newShellFolder, LPCITEMIDLIST absolutePIDL, FOLDERSETTINGS *folderSettings, long flags); HRESULT GetMenuBand(REFIID riid, void **shellMenu); - HRESULT GetBaseBar(bool vertical, IUnknown **theBaseBar); + HRESULT GetBaseBar(bool vertical, REFIID riid, void **theBaseBar); BOOL IsBandLoaded(const CLSID clsidBand, bool verticali, DWORD *pdwBandID); HRESULT ShowBand(const CLSID &classID, bool vertical); HRESULT NavigateToParent(); @@ -740,15 +730,9 @@ if (m_hWnd == NULL) return E_FAIL; -#if 0 - hResult = CoCreateInstance(CLSID_InternetToolbar, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &fClientBars[BIInternetToolbar].clientBar)); + hResult = CInternetToolbar_CreateInstance(IID_PPV_ARG(IUnknown, &clientBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; -#else - hResult = CreateInternetToolbar(IID_PPV_ARG(IUnknown, &clientBar)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; -#endif fClientBars[BIInternetToolbar].clientBar = clientBar; @@ -1105,7 +1089,7 @@ return deskBand->QueryInterface(riid, shellMenu); } -HRESULT CShellBrowser::GetBaseBar(bool vertical, IUnknown **theBaseBar) +HRESULT CShellBrowser::GetBaseBar(bool vertical, REFIID riid, void **theBaseBar) { CComPtr<IUnknown> newBaseBar; CComPtr<IDeskBar> deskBar; @@ -1120,10 +1104,10 @@ cache = &fClientBars[BIHorizontalBaseBar].clientBar.p; if (*cache == NULL) { - hResult = CreateBaseBar(IID_PPV_ARG(IUnknown, &newBaseBar), vertical); + hResult = CBaseBar_CreateInstance(IID_PPV_ARG(IUnknown, &newBaseBar), vertical); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = CreateBaseBarSite(IID_PPV_ARG(IUnknown, &newBaseBarSite), vertical); + hResult = CBaseBarSite_CreateInstance(IID_PPV_ARG(IUnknown, &newBaseBarSite), vertical); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -1152,13 +1136,12 @@ return hResult; } - return (*cache)->QueryInterface(IID_PPV_ARG(IUnknown, theBaseBar)); + return (*cache)->QueryInterface(riid, theBaseBar); } BOOL CShellBrowser::IsBandLoaded(const CLSID clsidBand, bool vertical, DWORD *pdwBandID) { HRESULT hResult; - CComPtr<IUnknown> baseBar; CComPtr<IDeskBar> deskBar; CComPtr<IUnknown> baseBarSite; CComPtr<IBandSite> bandSite; @@ -1168,10 +1151,7 @@ DWORD i; /* Get our basebarsite to be able to enumerate bands */ - hResult = GetBaseBar(vertical, &baseBar); - if (FAILED_UNEXPECTEDLY(hResult)) - return FALSE; - hResult = baseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); + hResult = GetBaseBar(vertical, IID_PPV_ARG(IDeskBar, &deskBar)); if (FAILED_UNEXPECTEDLY(hResult)) return FALSE; hResult = deskBar->GetClient(&baseBarSite); @@ -1213,41 +1193,34 @@ CComPtr<IDockingWindow> dockingWindow; CComPtr<IUnknown> baseBarSite; CComPtr<IUnknown> newBand; - CComPtr<IUnknown> theBaseBar; CComPtr<IDeskBar> deskBar; VARIANT vaIn; HRESULT hResult; DWORD dwBandID; - hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar); + hResult = GetBaseBar(vertical, IID_PPV_ARG(IDeskBar, &deskBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); + hResult = deskBar->GetClient(&baseBarSite); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = deskBar->GetClient(&baseBarSite); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - - hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = deskBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (!IsBandLoaded(classID, vertical, &dwBandID)) { -#if USE_CUSTOM_EXPLORERBAND TRACE("ShowBand called for CLSID %s, vertical=%d...\n", wine_dbgstr_guid(&classID), vertical); if (IsEqualCLSID(CLSID_ExplorerBand, classID)) { TRACE("CLSID_ExplorerBand requested, building internal band.\n"); - hResult = CExplorerBand_Constructor(IID_PPV_ARG(IUnknown, &newBand)); + hResult = CExplorerBand_CreateInstance(IID_PPV_ARG(IUnknown, &newBand)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } else -#endif { TRACE("A different CLSID requested, using CoCreateInstance.\n"); hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &newBand)); @@ -2388,7 +2361,7 @@ *pptl = NULL; if (fTravelLog.p == NULL) { - hResult = CreateTravelLog(IID_PPV_ARG(ITravelLog, &fTravelLog)); + hResult = CTravelLog_CreateInstance(IID_PPV_ARG(ITravelLog, &fTravelLog)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } Modified: trunk/reactos/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/toolsba… ============================================================================== --- trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -433,7 +433,7 @@ return 0; } -HRESULT CreateToolsBar(REFIID riid, void **ppv) +HRESULT CToolsBand_CreateInstance(REFIID riid, void **ppv) { return ShellObjectCreator<CToolsBand>(riid, ppv); } Modified: trunk/reactos/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/travell… ============================================================================== --- trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -624,7 +624,7 @@ return E_NOTIMPL; } -HRESULT CreateTravelLog(REFIID riid, void **ppv) +HRESULT CTravelLog_CreateInstance(REFIID riid, void **ppv) { return ShellObjectCreatorInit<CTravelLog>(riid, ppv); }

1 0

[dchapyshev] 72052: [USER32] - Add missing NULL-pointer checkes in rect functions - Small coding-style fixes
by dchapyshev＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: dchapyshev Date: Sat Jul 30 11:31:33 2016 New Revision: 72052 URL: http://svn.reactos.org/svn/reactos?rev=72052&view=rev Log: [USER32] - Add missing NULL-pointer checkes in rect functions - Small coding-style fixes Modified: trunk/reactos/win32ss/user/user32/windows/rect.c Modified: trunk/reactos/win32ss/user/user32/windows/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] Sat Jul 30 11:31:33 2016 @@ -41,11 +41,12 @@ CopyRect(LPRECT lprcDst, CONST RECT *lprcSrc) { - if(lprcDst == NULL || lprcSrc == NULL) - return(FALSE); + if (lprcDst == NULL || lprcSrc == NULL) + return FALSE; *lprcDst = *lprcSrc; - return(TRUE); + + return TRUE; } @@ -74,11 +75,15 @@ int dx, int dy) { + if (rect == NULL) + return FALSE; + rect->left -= dx; rect->top -= dy; rect->right += dx; rect->bottom += dy; - return(TRUE); + + return TRUE; } @@ -91,6 +96,9 @@ CONST RECT *lprcSrc1, CONST RECT *lprcSrc2) { + if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) + return FALSE; + if (IsRectEmpty(lprcSrc1) || IsRectEmpty(lprcSrc2) || lprcSrc1->left >= lprcSrc2->right || lprcSrc2->left >= lprcSrc1->right || @@ -98,13 +106,15 @@ lprcSrc2->top >= lprcSrc1->bottom) { SetRectEmpty(lprcDst); - return(FALSE); - } + return FALSE; + } + lprcDst->left = max(lprcSrc1->left, lprcSrc2->left); lprcDst->right = min(lprcSrc1->right, lprcSrc2->right); lprcDst->top = max(lprcSrc1->top, lprcSrc2->top); lprcDst->bottom = min(lprcSrc1->bottom, lprcSrc2->bottom); - return(TRUE); + + return TRUE; } @@ -115,7 +125,10 @@ WINAPI IsRectEmpty(CONST RECT *lprc) { - return((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom)); + if (lprc == NULL) + return TRUE; + + return ((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom)); } @@ -128,14 +141,15 @@ int dx, int dy) { - if(rect == NULL) - return(FALSE); + if (rect == NULL) + return FALSE; rect->left += dx; rect->top += dy; rect->right += dx; rect->bottom += dy; - return(TRUE); + + return TRUE; } @@ -147,6 +161,9 @@ PtInRect(CONST RECT *lprc, POINT pt) { + if (lprc == NULL) + return FALSE; + return((pt.x >= lprc->left) && (pt.x < lprc->right) && (pt.y >= lprc->top) && (pt.y < lprc->bottom)); } @@ -159,7 +176,7 @@ int xRight, int yBottom) { - if (!lprc) + if (lprc == NULL) return FALSE; lprc->left = xLeft; @@ -178,8 +195,12 @@ WINAPI SetRectEmpty(LPRECT lprc) { + if (lprc == NULL) + return FALSE; + lprc->left = lprc->right = lprc->top = lprc->bottom = 0; - return(TRUE); + + return TRUE; } @@ -194,13 +215,13 @@ { RECT tempRect; - if(lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) - return(FALSE); - - if(!IntersectRect(&tempRect, lprcSrc1, lprcSrc2)) + if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) + return FALSE; + + if (!IntersectRect(&tempRect, lprcSrc1, lprcSrc2)) { *lprcDst = *lprcSrc1; - return(TRUE); + return TRUE; } if (EqualRect(&tempRect, lprcSrc1)) @@ -211,22 +232,22 @@ *lprcDst = *lprcSrc1; - if(lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom) - { - if(lprcDst->left == tempRect.left) + if (lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom) + { + if (lprcDst->left == tempRect.left) lprcDst->left = tempRect.right; - else if(lprcDst->right == tempRect.right) + else if (lprcDst->right == tempRect.right) lprcDst->right = tempRect.left; } - else if(lprcDst->left == tempRect.left && lprcDst->right == tempRect.right) - { - if(lprcDst->top == tempRect.top) + else if (lprcDst->left == tempRect.left && lprcDst->right == tempRect.right) + { + if (lprcDst->top == tempRect.top) lprcDst->top = tempRect.bottom; - else if(lprcDst->bottom == tempRect.bottom) + else if (lprcDst->bottom == tempRect.bottom) lprcDst->bottom = tempRect.top; } - return(TRUE); + return TRUE; } @@ -239,12 +260,15 @@ CONST RECT *lprcSrc1, CONST RECT *lprcSrc2) { + if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) + return FALSE; + if (IsRectEmpty(lprcSrc1)) { if (IsRectEmpty(lprcSrc2)) { SetRectEmpty(lprcDst); - return(FALSE); + return FALSE; } else { @@ -266,5 +290,5 @@ } } - return(TRUE); -} + return TRUE; +}

1 0

[zhu] 72051: Major rewrite of address.c, completely restructuring internal data. No longer maintaining linked list of connection endpoints; their references are handed off to lwIP to keep track of ...
by zhu＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: zhu Date: Fri Jul 29 16:28:01 2016 New Revision: 72051 URL: http://svn.reactos.org/svn/reactos?rev=72051&view=rev Log: Major rewrite of address.c, completely restructuring internal data. No longer maintaining linked list of connection endpoints; their references are handed off to lwIP to keep track of in protocol control blocks. Scrapped redundant functions in duplicate address checking code in favor of exposing lwIP's free-port checking function and letting lwIP handle address collisions when binding. Added a custom mutex that allows only one execution context to access each connection endpoint (TCP_CONTEXT). Massively improved coding style consistency. Server side can handle multiple incoming connections in series without crashing, but there is an undiagnosed issue that causes frequent crashes on repeated attempts to connect to a server. The crash always happens after a call to tcp_connect() has been made, and before it returns. No attempted solution to the lwIP multi-threading problem in this commit. Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/core/tcp.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/core/udp.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/tcp.h branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/udp.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/core/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/core/udp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/udp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr…

1 0

[hbelusca] 72050: [PCIX] Fix Device_SaveCurrentSettings: do not reference BarArray too soon if the index is out of bounds (in that case it means we are handling a ROM "BAR"). CID 716153, reported b...
by hbelusca＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: hbelusca Date: Fri Jul 29 13:44:37 2016 New Revision: 72050 URL: http://svn.reactos.org/svn/reactos?rev=72050&view=rev Log: [PCIX] Fix Device_SaveCurrentSettings: do not reference BarArray too soon if the index is out of bounds (in that case it means we are handling a ROM "BAR"). CID 716153, reported by Victor Martinez Calvo. CORE-11215 #resolve Modified: trunk/reactos/drivers/bus/pcix/device.c Modified: trunk/reactos/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/device.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] Fri Jul 29 13:44:37 2016 @@ -46,12 +46,12 @@ CmDescriptor->u.Generic.Start.HighPart = 0; CmDescriptor->u.Generic.Length = IoDescriptor->u.Generic.Length; - /* Read the actual BAR value */ - Bar = BarArray[i]; - - /* Check which BAR is being processed now */ - if (i != PCI_TYPE0_ADDRESSES) - { + /* Check if we're handling PCI BARs, or the ROM BAR */ + if (i < PCI_TYPE0_ADDRESSES) + { + /* Read the actual BAR value */ + Bar = BarArray[i]; + /* Check if this is an I/O BAR */ if (Bar & PCI_ADDRESS_IO_SPACE) {

1 0

[hbelusca] 72049: [XDK] - Move the PCI_COMMON_HEADER_LAYOUT next to the structures that use it. - Add IRP flags description comments.
by hbelusca＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: hbelusca Date: Fri Jul 29 13:17:58 2016 New Revision: 72049 URL: http://svn.reactos.org/svn/reactos?rev=72049&view=rev Log: [XDK] - Move the PCI_COMMON_HEADER_LAYOUT next to the structures that use it. - Add IRP flags description comments. Modified: trunk/reactos/sdk/include/xdk/iotypes.h Modified: trunk/reactos/sdk/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/iotypes.h?… ============================================================================== --- trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] Fri Jul 29 13:17:58 2016 @@ -498,80 +498,6 @@ ULONG SharedDelete; } SHARE_ACCESS, *PSHARE_ACCESS; -/* While MS WDK uses inheritance in C++, we cannot do this with gcc, as - inheritance, even from a struct renders the type non-POD. So we use - this hack */ -#define PCI_COMMON_HEADER_LAYOUT \ - USHORT VendorID; \ - USHORT DeviceID; \ - USHORT Command; \ - USHORT Status; \ - UCHAR RevisionID; \ - UCHAR ProgIf; \ - UCHAR SubClass; \ - UCHAR BaseClass; \ - UCHAR CacheLineSize; \ - UCHAR LatencyTimer; \ - UCHAR HeaderType; \ - UCHAR BIST; \ - union { \ - struct _PCI_HEADER_TYPE_0 { \ - ULONG BaseAddresses[PCI_TYPE0_ADDRESSES]; \ - ULONG CIS; \ - USHORT SubVendorID; \ - USHORT SubSystemID; \ - ULONG ROMBaseAddress; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved1[3]; \ - ULONG Reserved2; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - UCHAR MinimumGrant; \ - UCHAR MaximumLatency; \ - } type0; \ - struct _PCI_HEADER_TYPE_1 { \ - ULONG BaseAddresses[PCI_TYPE1_ADDRESSES]; \ - UCHAR PrimaryBus; \ - UCHAR SecondaryBus; \ - UCHAR SubordinateBus; \ - UCHAR SecondaryLatency; \ - UCHAR IOBase; \ - UCHAR IOLimit; \ - USHORT SecondaryStatus; \ - USHORT MemoryBase; \ - USHORT MemoryLimit; \ - USHORT PrefetchBase; \ - USHORT PrefetchLimit; \ - ULONG PrefetchBaseUpper32; \ - ULONG PrefetchLimitUpper32; \ - USHORT IOBaseUpper16; \ - USHORT IOLimitUpper16; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved1[3]; \ - ULONG ROMBaseAddress; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - USHORT BridgeControl; \ - } type1; \ - struct _PCI_HEADER_TYPE_2 { \ - ULONG SocketRegistersBaseAddress; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved; \ - USHORT SecondaryStatus; \ - UCHAR PrimaryBus; \ - UCHAR SecondaryBus; \ - UCHAR SubordinateBus; \ - UCHAR SecondaryLatency; \ - struct { \ - ULONG Base; \ - ULONG Limit; \ - } Range[PCI_TYPE2_ADDRESSES-1]; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - USHORT BridgeControl; \ - } type2; \ - } u; - typedef enum _CREATE_FILE_TYPE { CreateFileTypeNone, CreateFileTypeNamedPipe, @@ -1836,7 +1762,7 @@ #define VPB_RAW_MOUNT 0x0010 #define VPB_DIRECT_WRITES_ALLOWED 0x0020 -/* IRP.Flags */ +/* IO_STACK_LOCATION.Flags */ #define SL_FORCE_ACCESS_CHECK 0x01 #define SL_OPEN_PAGING_FILE 0x02 @@ -1876,6 +1802,8 @@ $endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) + +/* IRP.Flags */ #define IRP_NOCACHE 0x00000001 #define IRP_PAGING_IO 0x00000002 #define IRP_MOUNT_COMPLETION 0x00000002 @@ -1896,6 +1824,7 @@ #define IRP_RETRY_IO_COMPLETION 0x00004000 #define IRP_CLASS_CACHE_OPERATION 0x00008000 +/* IRP.AllocationFlags */ #define IRP_QUOTA_CHARGED 0x01 #define IRP_ALLOCATED_MUST_SUCCEED 0x02 #define IRP_ALLOCATED_FIXED_SIZE 0x04 @@ -3181,6 +3110,80 @@ #define PCI_TYPE1_ADDRESSES 2 #define PCI_TYPE2_ADDRESSES 5 +/* While MS WDK uses inheritance in C++, we cannot do this with gcc, as + inheritance, even from a struct renders the type non-POD. So we use + this hack */ +#define PCI_COMMON_HEADER_LAYOUT \ + USHORT VendorID; \ + USHORT DeviceID; \ + USHORT Command; \ + USHORT Status; \ + UCHAR RevisionID; \ + UCHAR ProgIf; \ + UCHAR SubClass; \ + UCHAR BaseClass; \ + UCHAR CacheLineSize; \ + UCHAR LatencyTimer; \ + UCHAR HeaderType; \ + UCHAR BIST; \ + union { \ + struct _PCI_HEADER_TYPE_0 { \ + ULONG BaseAddresses[PCI_TYPE0_ADDRESSES]; \ + ULONG CIS; \ + USHORT SubVendorID; \ + USHORT SubSystemID; \ + ULONG ROMBaseAddress; \ + UCHAR CapabilitiesPtr; \ + UCHAR Reserved1[3]; \ + ULONG Reserved2; \ + UCHAR InterruptLine; \ + UCHAR InterruptPin; \ + UCHAR MinimumGrant; \ + UCHAR MaximumLatency; \ + } type0; \ + struct _PCI_HEADER_TYPE_1 { \ + ULONG BaseAddresses[PCI_TYPE1_ADDRESSES]; \ + UCHAR PrimaryBus; \ + UCHAR SecondaryBus; \ + UCHAR SubordinateBus; \ + UCHAR SecondaryLatency; \ + UCHAR IOBase; \ + UCHAR IOLimit; \ + USHORT SecondaryStatus; \ + USHORT MemoryBase; \ + USHORT MemoryLimit; \ + USHORT PrefetchBase; \ + USHORT PrefetchLimit; \ + ULONG PrefetchBaseUpper32; \ + ULONG PrefetchLimitUpper32; \ + USHORT IOBaseUpper16; \ + USHORT IOLimitUpper16; \ + UCHAR CapabilitiesPtr; \ + UCHAR Reserved1[3]; \ + ULONG ROMBaseAddress; \ + UCHAR InterruptLine; \ + UCHAR InterruptPin; \ + USHORT BridgeControl; \ + } type1; \ + struct _PCI_HEADER_TYPE_2 { \ + ULONG SocketRegistersBaseAddress; \ + UCHAR CapabilitiesPtr; \ + UCHAR Reserved; \ + USHORT SecondaryStatus; \ + UCHAR PrimaryBus; \ + UCHAR SecondaryBus; \ + UCHAR SubordinateBus; \ + UCHAR SecondaryLatency; \ + struct { \ + ULONG Base; \ + ULONG Limit; \ + } Range[PCI_TYPE2_ADDRESSES-1]; \ + UCHAR InterruptLine; \ + UCHAR InterruptPin; \ + USHORT BridgeControl; \ + } type2; \ + } u; + typedef struct _PCI_COMMON_HEADER { PCI_COMMON_HEADER_LAYOUT } PCI_COMMON_HEADER, *PPCI_COMMON_HEADER;

1 0

[gadamopoulos] 72048: Fix build.
by gadamopoulos＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: gadamopoulos Date: Fri Jul 29 12:59:16 2016 New Revision: 72048 URL: http://svn.reactos.org/svn/reactos?rev=72048&view=rev Log: Fix build. Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.h Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] Fri Jul 29 12:59:16 2016 @@ -97,15 +97,6 @@ END_COM_MAP() }; -struct _DoDropData { - CFSDropTarget *This; - IStream *pStream; - DWORD dwKeyState; - POINTL pt; - DWORD pdwEffect; -}; - - class CFSDropTarget : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IDropTarget @@ -142,4 +133,12 @@ }; +struct _DoDropData { + CFSDropTarget *This; + IStream *pStream; + DWORD dwKeyState; + POINTL pt; + DWORD pdwEffect; +}; + #endif /* _CFSFOLDER_H_ */

1 0

[gadamopoulos] 72047: [SHELL32] - Factor CFSDropTarget out of CFSFolder. - For now their code is mixed (no code was moved), until we decide where exactly is should be kept.
by gadamopoulos＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: gadamopoulos Date: Fri Jul 29 12:56:06 2016 New Revision: 72047 URL: http://svn.reactos.org/svn/reactos?rev=72047&view=rev Log: [SHELL32] - Factor CFSDropTarget out of CFSFolder. - For now their code is mixed (no code was moved), until we decide where exactly is should be kept. Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.h Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Fri Jul 29 12:56:06 2016 @@ -62,25 +62,11 @@ return CreateFolderEnumList(sPathTarget, dwFlags); } -/************************************************************************** -* registers clipboardformat once -*/ -void CFSFolder::SF_RegisterClipFmt() -{ - TRACE ("(%p)\n", this); - - if (!cfShellIDList) - cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); -} - CFSFolder::CFSFolder() { pclsid = (CLSID *)&CLSID_ShellFSFolder; sPathTarget = NULL; pidlRoot = NULL; - cfShellIDList = 0; - SF_RegisterClipFmt(); - fAcceptFmt = FALSE; m_bGroupPolicyActive = 0; } @@ -378,7 +364,7 @@ *ppvOut = NULL; if (IsEqualIID (riid, IID_IDropTarget)) - hr = this->QueryInterface (IID_IDropTarget, ppvOut); + hr = ShellObjectCreatorInit<CFSDropTarget>(sPathTarget, riid, ppvOut); else if (IsEqualIID (riid, IID_IContextMenu)) { FIXME ("IContextMenu not implemented\n"); @@ -524,7 +510,7 @@ if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) { IDropTarget * pDt = NULL; - hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + hr = ShellObjectCreatorInit<CFSDropTarget>(sPathTarget, riid, ppvOut); pObj = pDt; } } @@ -871,11 +857,11 @@ } /**************************************************************************** - * CFSFolder::CopyItems + * CFSDropTarget::CopyItems * * copies items to this folder */ -HRESULT WINAPI CFSFolder::CopyItems(IShellFolder * pSFFrom, UINT cidl, +HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, BOOL bCopy) { CComPtr<IPersistFolder2> ppf2 = NULL; @@ -1136,8 +1122,34 @@ return E_NOTIMPL; } +CFSDropTarget::CFSDropTarget(): + cfShellIDList(0), + fAcceptFmt(FALSE), + sPathTarget(NULL) +{ +} + +HRESULT WINAPI CFSDropTarget::Initialize(LPWSTR PathTarget) +{ + cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); + if (!cfShellIDList) + return E_FAIL; + + sPathTarget = (WCHAR *)SHAlloc((wcslen(PathTarget) + 1) * sizeof(WCHAR)); + if (!sPathTarget) + return E_OUTOFMEMORY; + wcscpy(sPathTarget, PathTarget); + + return S_OK; +} + +CFSDropTarget::~CFSDropTarget() +{ + SHFree(sPathTarget); +} + BOOL -CFSFolder::GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) +CFSDropTarget::GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) { WCHAR wszLink[40]; @@ -1166,7 +1178,7 @@ /**************************************************************************** * IDropTarget implementation */ -BOOL CFSFolder::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) +BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) { /* TODO Windows does different drop effects if dragging across drives. i.e., it will copy instead of move if the directories are on different disks. */ @@ -1189,8 +1201,8 @@ return FALSE; } -HRESULT WINAPI CFSFolder::DragEnter(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); FORMATETC fmt; @@ -1209,8 +1221,8 @@ return S_OK; } -HRESULT WINAPI CFSFolder::DragOver(DWORD dwKeyState, POINTL pt, - DWORD *pdwEffect) +HRESULT WINAPI CFSDropTarget::DragOver(DWORD dwKeyState, POINTL pt, + DWORD *pdwEffect) { TRACE("(%p)\n", this); @@ -1222,7 +1234,7 @@ return S_OK; } -HRESULT WINAPI CFSFolder::DragLeave() +HRESULT WINAPI CFSDropTarget::DragLeave() { TRACE("(%p)\n", this); @@ -1231,8 +1243,8 @@ return S_OK; } -HRESULT WINAPI CFSFolder::Drop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p) object dropped, effect %u\n", this, *pdwEffect); @@ -1259,15 +1271,15 @@ data->pt = pt; // Need to dereference as pdweffect gets freed. data->pdwEffect = *pdwEffect; - SHCreateThread(CFSFolder::_DoDropThreadProc, data, NULL, NULL); + SHCreateThread(CFSDropTarget::_DoDropThreadProc, data, NULL, NULL); return S_OK; } } return this->_DoDrop(pDataObject, dwKeyState, pt, pdwEffect); } -HRESULT WINAPI CFSFolder::_DoDrop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p) performing drop, effect %u\n", this, *pdwEffect); FORMATETC fmt; @@ -1315,17 +1327,6 @@ CComPtr<IShellFolder> psfDesktop; CComPtr<IShellFolder> psfFrom = NULL; - CComPtr<IShellFolder> psfTarget = NULL; - - hr = this->QueryInterface(IID_PPV_ARG(IShellFolder, &psfTarget)); - if (FAILED(hr)) - { - ERR("psfTarget setting failed\n"); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } /* Grab the desktop shell folder */ hr = SHGetDesktopFolder(&psfDesktop); @@ -1359,32 +1360,11 @@ if (bLinking) { - CComPtr<IPersistFolder2> ppf2 = NULL; - STRRET strFile; WCHAR wszTargetPath[MAX_PATH]; - LPITEMIDLIST targetpidl; WCHAR wszPath[MAX_PATH]; WCHAR wszTarget[MAX_PATH]; - hr = this->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); - if (SUCCEEDED(hr)) - { - hr = ppf2->GetCurFolder(&targetpidl); - if (SUCCEEDED(hr)) - { - hr = psfDesktop->GetDisplayNameOf(targetpidl, SHGDN_FORPARSING, &strFile); - ILFree(targetpidl); - if (SUCCEEDED(hr)) - { - hr = StrRetToBufW(&strFile, NULL, wszTargetPath, _countof(wszTargetPath)); - } - } - } - - if (FAILED(hr)) - { - ERR("Error obtaining target path"); - } + wcscpy(wszTargetPath, sPathTarget); TRACE("target path = %s", debugstr_w(wszTargetPath)); @@ -1415,7 +1395,7 @@ LPWSTR pwszFileName = PathFindFileNameW(wszPath); LPWSTR pwszExt = PathFindExtensionW(wszPath); - LPWSTR placementPath = PathCombineW(lpStr1, wszTargetPath, pwszFileName); + LPWSTR placementPath = PathCombineW(lpStr1, sPathTarget, pwszFileName); CComPtr<IPersistFile> ppf; //Check to see if it's already a link. @@ -1428,7 +1408,7 @@ hr = E_FAIL; break; } - hr = IShellLink_ConstructFromFile(this, apidl[i], IID_PPV_ARG(IPersistFile, &ppf)); + hr = IShellLink_ConstructFromPath(wszPath, IID_PPV_ARG(IPersistFile, &ppf)); if (FAILED(hr)) { ERR("Error constructing link from file"); break; @@ -1495,41 +1475,13 @@ InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); if (SUCCEEDED(pDataObject->GetData(&fmt2, &medium)) /* && SUCCEEDED(pDataObject->GetData(&fmt2, &medium))*/) { - CComPtr<IPersistFolder2> ppf2 = NULL; - STRRET strFile; WCHAR wszTargetPath[MAX_PATH + 1]; LPWSTR pszSrcList; - LPITEMIDLIST targetpidl; - CComPtr<IShellFolder> psfDesktop = NULL; - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - { - ERR("SHGetDesktopFolder failed\n"); - return E_FAIL; - } - - hr = this->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); - if (SUCCEEDED(hr)) - { - hr = ppf2->GetCurFolder(&targetpidl); - if (SUCCEEDED(hr)) - { - hr = psfDesktop->GetDisplayNameOf(targetpidl, SHGDN_FORPARSING, &strFile); - ILFree(targetpidl); - if (SUCCEEDED(hr)) - { - hr = StrRetToBufW(&strFile, NULL, wszTargetPath, _countof(wszTargetPath)); - //Double NULL terminate. - wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; - } - } - } - if (FAILED(hr)) - { - ERR("Error obtaining target path"); - return E_FAIL; - } - + + wcscpy(wszTargetPath, sPathTarget); + //Double NULL terminate. + wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; + LPDROPFILES lpdf = (LPDROPFILES) GlobalLock(medium.hGlobal); if (!lpdf) { @@ -1561,7 +1513,8 @@ return hr; } -DWORD WINAPI CFSFolder::_DoDropThreadProc(LPVOID lpParameter) { +DWORD WINAPI CFSDropTarget::_DoDropThreadProc(LPVOID lpParameter) +{ CoInitialize(NULL); _DoDropData *data = static_cast<_DoDropData*>(lpParameter); CComPtr<IDataObject> pDataObject; @@ -1591,7 +1544,14 @@ TRACE("CFSFolder::_GetDropTarget entered\n"); if (_ILIsFolder (pidl)) - return this->BindToObject(pidl, NULL, IID_IDropTarget, ppvOut); + { + CComPtr<IShellFolder> psfChild; + hr = this->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return psfChild->CreateViewObject(NULL, IID_IDropTarget, ppvOut); + } STRRET strFile; hr = this->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile); Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] Fri Jul 29 12:56:06 2016 @@ -29,8 +29,7 @@ public CComCoClass<CFSFolder, &CLSID_ShellFSFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, - public IPersistFolder3, - public IDropTarget + public IPersistFolder3 { private: CLSID *pclsid; @@ -40,24 +39,15 @@ LPITEMIDLIST pidlRoot; /* absolute pidl */ - UINT cfShellIDList; /* clipboardformat for IDropTarget */ - BOOL fAcceptFmt; /* flag for pending Drop */ - BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); DWORD m_bGroupPolicyActive; - void SF_RegisterClipFmt(); - BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); - static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); - virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); virtual HRESULT WINAPI _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut); virtual HRESULT WINAPI _LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPCWSTR pwcsname, LPVOID *ppvOut); virtual HRESULT WINAPI _LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut); - virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); public: CFSFolder(); ~CFSFolder(); - // IShellFolder virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); @@ -92,12 +82,6 @@ virtual HRESULT WINAPI InitializeEx(IBindCtx *pbc, LPCITEMIDLIST pidlRoot, const PERSIST_FOLDER_TARGET_INFO *ppfti); virtual HRESULT WINAPI GetFolderTargetInfo(PERSIST_FOLDER_TARGET_INFO *ppfti); - // IDropTarget - virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI DragLeave(); - virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) DECLARE_NOT_AGGREGATABLE(CFSFolder) @@ -110,16 +94,52 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder3, IPersistFolder3) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) END_COM_MAP() }; struct _DoDropData { - CFSFolder *This; + CFSDropTarget *This; IStream *pStream; DWORD dwKeyState; POINTL pt; DWORD pdwEffect; }; + +class CFSDropTarget : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDropTarget +{ + private: + UINT cfShellIDList; /* clipboardformat for IDropTarget */ + BOOL fAcceptFmt; /* flag for pending Drop */ + LPWSTR sPathTarget; + + BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); + virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); + BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); + static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); + + public: + CFSDropTarget(); + ~CFSDropTarget(); + HRESULT WINAPI Initialize(LPWSTR PathTarget); + + // IDropTarget + virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragLeave(); + virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + + DECLARE_NOT_AGGREGATABLE(CFSDropTarget) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CFSDropTarget) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + END_COM_MAP() + +}; + #endif /* _CFSFOLDER_H_ */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2016