Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 63703: [RSHELL] * Now that CMergedFolder works, try to make it more like windows. * CMergedFolder: Declare and expose the undocumented IAugmentedShellFolder2 (all methods unimplemented ...
by dquintana＠svn.reactos.org 09 Jul '14

09 Jul '14

Author: dquintana Date: Wed Jul 9 23:05:37 2014 New Revision: 63703 URL: http://svn.reactos.org/svn/reactos?rev=63703&view=rev Log: [RSHELL] * Now that CMergedFolder works, try to make it more like windows. * CMergedFolder: Declare and expose the undocumented IAugmentedShellFolder2 (all methods unimplemented yet). It will require major changes to the way I implemented it, but it will be for the best. * CStartMenu: Make use of the real CMergedFolder in Windows 2003 (does not exist in win7). Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp branches/shell-experiments/base/shell/rshell/CMergedFolder.h branches/shell-experiments/base/shell/rshell/CStartMenu.cpp 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 Jul 9 23:05:37 2014 @@ -30,6 +30,7 @@ BOOL shared; IShellFolder * parent; LPITEMIDLIST pidl; + LPITEMIDLIST pidlCommon; }; class CEnumMergedFolder : @@ -67,7 +68,7 @@ HRESULT SetSources(IShellFolder * userLocal, IShellFolder * allUSers); HRESULT Begin(HWND hwndOwner, SHCONTF flags); - HRESULT FindPidlInList(LPCITEMIDLIST pcidl, LocalPidlInfo * pinfo); + HRESULT FindPidlInList(HWND hwndOwner, LPCITEMIDLIST pcidl, LocalPidlInfo * pinfo); virtual HRESULT STDMETHODCALLTYPE Next( ULONG celt, @@ -86,9 +87,10 @@ m_AllUSers(NULL), m_HwndOwner(NULL), m_Flags(0), - m_hDsaIndex(0) -{ - m_hDsa = DSA_Create(sizeof(LocalPidlInfo), 10); + m_hDsa(NULL), + m_hDsaIndex(0), + m_hDsaCount(0) +{ } CEnumMergedFolder::~CEnumMergedFolder() @@ -119,8 +121,8 @@ HRESULT CEnumMergedFolder::Begin(HWND hwndOwner, SHCONTF flags) { HRESULT hr; - - if (m_HwndOwner == hwndOwner && m_Flags == flags) + + if (m_hDsa && m_HwndOwner == hwndOwner && m_Flags == flags) { return Reset(); } @@ -135,6 +137,11 @@ { m_UserLocal = NULL; return hr; + } + + if (!m_hDsa) + { + m_hDsa = DSA_Create(sizeof(LocalPidlInfo), 10); } DSA_EnumCallback(m_hDsa, s_DsaDeleteCallback, this); @@ -242,9 +249,14 @@ return Reset(); } -HRESULT CEnumMergedFolder::FindPidlInList(LPCITEMIDLIST pcidl, LocalPidlInfo * pinfo) -{ - HRESULT hr; +HRESULT CEnumMergedFolder::FindPidlInList(HWND hwndOwner, LPCITEMIDLIST pcidl, LocalPidlInfo * pinfo) +{ + HRESULT hr; + + if (!m_hDsa) + { + Begin(hwndOwner, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS); + } TRACE("Searching for pidl { cb=%d } in a list of %d items\n", pcidl->mkid.cb, m_hDsaCount); @@ -299,10 +311,9 @@ // FIXME: ILClone shouldn't be needed here! This should be causing leaks if (rgelt) rgelt[i] = ILClone(info.pidl); + i++; m_hDsaIndex++; - i++; - if (m_hDsaIndex == m_hDsaCount) { if (pceltFetched) *pceltFetched = i; @@ -374,6 +385,37 @@ m_AllUSers = allUsers; m_EnumSource = new CComObject<CEnumMergedFolder>(); return m_EnumSource->SetSources(m_UserLocal, m_AllUSers); +} + +// IAugmentedShellFolder2 +HRESULT STDMETHODCALLTYPE CMergedFolder::AddNameSpace(LPGUID lpGuid, IShellFolder * psf, LPCITEMIDLIST pcidl, ULONG dwUnknown) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMergedFolder::GetNameSpaceID(LPCITEMIDLIST pcidl, LPGUID lpGuid) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMergedFolder::QueryNameSpace(ULONG dwUnknown, LPGUID lpGuid, IShellFolder ** ppsf) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMergedFolder::EnumNameSpace(ULONG dwUnknown, PULONG lpUnknown) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMergedFolder::UnWrapIDList(LPCITEMIDLIST pcidl, LONG lUnknown, IShellFolder ** ppsf, LPITEMIDLIST * ppidl1, LPITEMIDLIST *ppidl2, LONG * lpUnknown) +{ + UNIMPLEMENTED; + return E_NOTIMPL; } // IShellFolder @@ -385,8 +427,34 @@ LPITEMIDLIST *ppidl, ULONG *pdwAttributes) { - UNIMPLEMENTED; - return E_NOTIMPL; + HRESULT hr; + LocalPidlInfo info; + + if (!ppidl) return E_FAIL; + + if (pchEaten) *pchEaten = 0; + if (pdwAttributes) *pdwAttributes = 0; + + hr = m_UserLocal->ParseDisplayName(hwndOwner, pbcReserved, lpszDisplayName, pchEaten, ppidl, pdwAttributes); + if (SUCCEEDED(hr)) + { + hr = m_EnumSource->FindPidlInList(hwndOwner, *ppidl, &info); + if (SUCCEEDED(hr)) + return hr; + } + + hr = m_AllUSers->ParseDisplayName(hwndOwner, pbcReserved, lpszDisplayName, pchEaten, ppidl, pdwAttributes); + if (SUCCEEDED(hr)) + { + hr = m_EnumSource->FindPidlInList(hwndOwner, *ppidl, &info); + if (SUCCEEDED(hr)) + return hr; + } + + if (ppidl) *ppidl = NULL; + if (pchEaten) *pchEaten = 0; + if (pdwAttributes) *pdwAttributes = 0; + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } HRESULT STDMETHODCALLTYPE CMergedFolder::EnumObjects( @@ -412,7 +480,7 @@ TRACE("BindToObject\n"); - hr = m_EnumSource->FindPidlInList(pidl, &info); + hr = m_EnumSource->FindPidlInList(NULL, pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -478,7 +546,7 @@ { LPCITEMIDLIST pidl = apidl[i]; - hr = m_EnumSource->FindPidlInList(pidl, &info); + hr = m_EnumSource->FindPidlInList(NULL, pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -514,7 +582,7 @@ TRACE("Processing GetUIObjectOf item %d of %u...\n", i, cidl); - hr = m_EnumSource->FindPidlInList(pidl, &info); + hr = m_EnumSource->FindPidlInList(hwndOwner, pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -544,7 +612,7 @@ TRACE("GetDisplayNameOf\n"); - hr = m_EnumSource->FindPidlInList(pidl, &info); + hr = m_EnumSource->FindPidlInList(NULL, pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -630,7 +698,7 @@ TRACE("GetDetailsEx\n"); - hr = m_EnumSource->FindPidlInList(pidl, &info); + hr = m_EnumSource->FindPidlInList(NULL, pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -655,7 +723,7 @@ TRACE("GetDetailsOf\n"); - hr = m_EnumSource->FindPidlInList(pidl, &info); + hr = m_EnumSource->FindPidlInList(NULL, pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) 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 Jul 9 23:05:37 2014 @@ -19,12 +19,37 @@ */ #pragma once +static IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; +static IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0 } }; +static CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; + +interface IAugmentedShellFolder : public IShellFolder +{ + virtual HRESULT STDMETHODCALLTYPE AddNameSpace(LPGUID, IShellFolder *, LPCITEMIDLIST, ULONG) = 0; + virtual HRESULT STDMETHODCALLTYPE GetNameSpaceID(LPCITEMIDLIST, LPGUID) = 0; + virtual HRESULT STDMETHODCALLTYPE QueryNameSpace(ULONG, LPGUID, IShellFolder **) = 0; + virtual HRESULT STDMETHODCALLTYPE EnumNameSpace(ULONG, PULONG) = 0; +}; + +interface IAugmentedShellFolder2 : public IAugmentedShellFolder +{ + virtual HRESULT STDMETHODCALLTYPE UnWrapIDList(LPCITEMIDLIST, LONG, IShellFolder **, LPITEMIDLIST *, LPITEMIDLIST *, LONG *) = 0; +}; + +/* No idea what QUERYNAMESPACEINFO struct contains -- the prototype comes from the PDB info +interface IAugmentedShellFolder3 : public IAugmentedShellFolder2 +{ + virtual HRESULT STDMETHODCALLTYPE QueryNameSpace2(ULONG, QUERYNAMESPACEINFO *) = 0; +}; +*/ + class CEnumMergedFolder; class CMergedFolder : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, //public IStorage, + public IAugmentedShellFolder2, // -- undocumented //public IAugmentedShellFolder3, // -- undocumented //public IShellService, // -- undocumented //public ITranslateShellChangeNotify,// -- undocumented @@ -52,13 +77,15 @@ DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CMergedFolder) - COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder) + COM_INTERFACE_ENTRY2_IID(IID_IShellFolder, IShellFolder, IShellFolder2) COM_INTERFACE_ENTRY_IID(IID_IShellFolder2, IShellFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) + COM_INTERFACE_ENTRY_IID(IID_IAugmentedShellFolder, IAugmentedShellFolder) + COM_INTERFACE_ENTRY_IID(IID_IAugmentedShellFolder2, IAugmentedShellFolder2) + //COM_INTERFACE_ENTRY_IID(IID_IAugmentedShellFolder3, IAugmentedShellFolder3) //COM_INTERFACE_ENTRY_IID(IID_IStorage, IStorage) - //COM_INTERFACE_ENTRY_IID(IID_IAugmentedShellFolder3, IAugmentedShellFolder3) //COM_INTERFACE_ENTRY_IID(IID_IShellService, IShellService) //COM_INTERFACE_ENTRY_IID(IID_ITranslateShellChangeNotify,ITranslateShellChangeNotify) //COM_INTERFACE_ENTRY_IID(IID_IPersistPropertyBag,IPersistPropertyBag) @@ -166,4 +193,11 @@ // IPersistFolder2 virtual HRESULT STDMETHODCALLTYPE GetCurFolder(LPITEMIDLIST * pidl); -}; + + // IAugmentedShellFolder2 + virtual HRESULT STDMETHODCALLTYPE AddNameSpace(LPGUID lpGuid, IShellFolder * psf, LPCITEMIDLIST pcidl, ULONG dwUnknown); + virtual HRESULT STDMETHODCALLTYPE GetNameSpaceID(LPCITEMIDLIST pcidl, LPGUID lpGuid); + virtual HRESULT STDMETHODCALLTYPE QueryNameSpace(ULONG dwUnknown, LPGUID lpGuid, IShellFolder ** ppsf); + virtual HRESULT STDMETHODCALLTYPE EnumNameSpace(ULONG dwUnknown, PULONG lpUnknown); + virtual HRESULT STDMETHODCALLTYPE UnWrapIDList(LPCITEMIDLIST pcidl, LONG lUnknown, IShellFolder ** ppsf, LPITEMIDLIST * ppidl1, LPITEMIDLIST *ppidl2, LONG * lpUnknown); +}; Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Wed Jul 9 23:05:37 2014 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "precomp.h" + +#include "CMergedFolder.h" //#define TEST_TRACKPOPUPMENU_SUBMENUS @@ -63,6 +65,7 @@ CComPtr<IBandSite> m_pBandSite; CComPtr<IDeskBar> m_pDeskBar; CComPtr<ITrayPriv> m_pTrayPriv; + CComPtr<IShellFolder> m_programsFolder; HRESULT OnInitMenu() { @@ -141,6 +144,12 @@ int csidl = 0; IShellMenu *pShellMenu; + hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pShellMenu->Initialize(this, 0, ANCESTORDEFAULT, SMINIT_VERTICAL); + switch (psmd->uId) { case IDM_PROGRAMS: csidl = CSIDL_PROGRAMS; break; @@ -148,20 +157,22 @@ case IDM_DOCUMENTS: csidl = CSIDL_RECENT; break; } - hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = pShellMenu->Initialize(this, 0, ANCESTORDEFAULT, SMINIT_VERTICAL); - if (csidl) { - LPITEMIDLIST pidlStartMenu; - IShellFolder *psfDestop, *psfStartMenu; - - hr = SHGetFolderLocation(NULL, csidl, 0, 0, &pidlStartMenu); - hr = SHGetDesktopFolder(&psfDestop); - hr = psfDestop->BindToObject(pidlStartMenu, NULL, IID_PPV_ARG(IShellFolder, &psfStartMenu)); + IShellFolder *psfStartMenu; + + if (csidl == CSIDL_PROGRAMS && m_programsFolder) + { + psfStartMenu = m_programsFolder; + } + else + { + LPITEMIDLIST pidlStartMenu; + IShellFolder *psfDestop; + hr = SHGetFolderLocation(NULL, csidl, 0, 0, &pidlStartMenu); + hr = SHGetDesktopFolder(&psfDestop); + hr = psfDestop->BindToObject(pidlStartMenu, NULL, IID_PPV_ARG(IShellFolder, &psfStartMenu)); + } hr = pShellMenu->SetShellFolder(psfStartMenu, NULL, NULL, 0); } @@ -238,6 +249,12 @@ m_pShellMenu.Release(); m_pBandSite.Release(); m_pDeskBar.Release(); + } + + HRESULT _SetProgramsFolder(IShellFolder * programs) + { + m_programsFolder = programs; + return S_OK; } HRESULT STDMETHODCALLTYPE CallbackSM( @@ -265,6 +282,85 @@ } }; +HRESULT BindToDesktop(LPCITEMIDLIST pidl, IShellFolder ** ppsfResult) +{ + HRESULT hr; + CComPtr<IShellFolder> psfDesktop; + + *ppsfResult = NULL; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, ppsfResult)); + + return hr; +} + +HRESULT GetStartMenuFolder(IShellFolder ** ppsfStartMenu) +{ + HRESULT hr; + LPITEMIDLIST pidlUserStartMenu; + LPITEMIDLIST pidlCommonStartMenu; + + *ppsfStartMenu = NULL; + + hr = SHGetSpecialFolderLocation(NULL, CSIDL_STARTMENU, &pidlUserStartMenu); + if (FAILED(hr)) + return hr; + + if (FAILED(SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_STARTMENU, &pidlCommonStartMenu))) + { + BindToDesktop(pidlUserStartMenu, ppsfStartMenu); + ILFree(pidlUserStartMenu); + return S_OK; + } + + CComPtr<IShellFolder> psfUserStartMenu; + hr = BindToDesktop(pidlUserStartMenu, &psfUserStartMenu); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IShellFolder> psfCommonStartMenu; + hr = BindToDesktop(pidlCommonStartMenu, &psfCommonStartMenu); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + +#if CUSTOM_MERGE_FOLDERS + IShellFolder * psfMerged; + hr = CMergedFolder_Constructor(psfUserStartMenu, psfCommonStartMenu, IID_PPV_ARG(IShellFolder, &psfMerged)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; +#else + CComPtr<IAugmentedShellFolder> pasf; + hr = CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IAugmentedShellFolder, &pasf)); + if (FAILED_UNEXPECTEDLY(hr)) + { + BindToDesktop(pidlUserStartMenu, ppsfStartMenu); + ILFree(pidlCommonStartMenu); + ILFree(pidlUserStartMenu); + return S_OK; + } + + hr = pasf->AddNameSpace(NULL, psfUserStartMenu, pidlUserStartMenu, 0xFF00); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pasf->AddNameSpace(NULL, psfCommonStartMenu, pidlCommonStartMenu, 0); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pasf->QueryInterface(IID_PPV_ARG(IShellFolder, ppsfStartMenu)); + pasf.Release(); +#endif + + ILFree(pidlCommonStartMenu); + ILFree(pidlUserStartMenu); + + return hr; +} + extern "C" HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv) @@ -274,15 +370,10 @@ IDeskBar* pDeskBar; HRESULT hr; - IShellFolder *shellFolder; - - LPITEMIDLIST pidlStartMenuUser; - IShellFolder *psfStartMenuUser; - -#if MERGE_FOLDERS - LPITEMIDLIST pidlStartMenuAll; - IShellFolder *psfStartMenuAll; -#endif + IShellFolder * psf; + + LPITEMIDLIST pidlPrograms; + CComPtr<IShellFolder> psfPrograms; hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); if (FAILED_UNEXPECTEDLY(hr)) @@ -306,32 +397,26 @@ pShellMenu->Initialize(pCallback, (UINT) -1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL); if (FAILED_UNEXPECTEDLY(hr)) return hr; - - hr = SHGetDesktopFolder(&shellFolder); - - /* FIXME: Use CLSID_MergedFolder class and IID_IAugmentedShellFolder2 interface here */ - /* CLSID_MergedFolder 26fdc864-be88-46e7-9235-032d8ea5162e */ - /* IID_IAugmentedShellFolder2 8db3b3f4-6cfe-11d1-8ae9-00c04fd918d0 */ - hr = SHGetFolderLocation(NULL, CSIDL_STARTMENU, 0, 0, &pidlStartMenuUser); - hr = shellFolder->BindToObject(pidlStartMenuUser, NULL, IID_PPV_ARG(IShellFolder, &psfStartMenuUser)); - -#if MERGE_FOLDERS - hr = SHGetFolderLocation(NULL, CSIDL_COMMON_STARTMENU, 0, 0, &pidlStartMenuAll); - hr = shellFolder->BindToObject(pidlStartMenuAll, NULL, IID_PPV_ARG(IShellFolder, &psfStartMenuAll)); - - IShellFolder * psfMerged; - hr = CMergedFolder_Constructor(psfStartMenuUser, psfStartMenuAll, IID_PPV_ARG(IShellFolder, &psfMerged)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = pShellMenu->SetShellFolder(psfMerged, NULL, NULL, 0); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; -#else - hr = pShellMenu->SetShellFolder(psfStartMenuUser, NULL, NULL, 0); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; -#endif + + hr = GetStartMenuFolder(&psf); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = psf->ParseDisplayName(NULL, NULL, L"Programs", NULL, &pidlPrograms, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = psf->BindToObject(pidlPrograms, NULL, IID_PPV_ARG(IShellFolder, &psfPrograms)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pCallback->_SetProgramsFolder(psfPrograms); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pShellMenu->SetShellFolder(psf, NULL, NULL, 0); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; hr = pDeskBar->SetClient(pBandSite); if (FAILED_UNEXPECTEDLY(hr))

1 0

[dquintana] 63702: [RSHELL] * CFocusManager: Try to fix some weird behaviour. * CMergedFolder: Downgrade some prints to TRACEs, and implement a couple methods needed by some debugging code. * Activ...
by dquintana＠svn.reactos.org 09 Jul '14

09 Jul '14

Author: dquintana Date: Wed Jul 9 00:42:05 2014 New Revision: 63702 URL: http://svn.reactos.org/svn/reactos?rev=63702&view=rev Log: [RSHELL] * CFocusManager: Try to fix some weird behaviour. * CMergedFolder: Downgrade some prints to TRACEs, and implement a couple methods needed by some debugging code. * Activate merged folders by default. TODO: implement the filtering of the "Programs" submenu, and use it for the real Programs menu item. [SHELL32] * defcontextmenu.cpp: Make a copy of the apidl array before storing it for later, since it may be a pointer to the stack which may not be available later. Fixes the merged folders not working on clicks and context menu. * shlmenu.cpp: While debugging, I made Shell_MergeMenus closer to WINE's. Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp branches/shell-experiments/dll/win32/shell32/shlmenu.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Wed Jul 9 00:42:05 2014 @@ -319,7 +319,7 @@ } BOOL isTracking = FALSE; - if (entry) + if (entry && (entry->type == MenuBarEntry || m_current->type != TrackedMenuEntry)) { ScreenToClient(child, &pt); iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &pt); @@ -485,7 +485,21 @@ if (hoveringMenuBar) { m_menuBar->mb->_DisableMouseTrack(TRUE); + if (m_current->type == TrackedMenuEntry) + { + SendMessage(m_parent->hwnd, WM_CANCELMODE, 0, 0); + msg->message = WM_NULL; + } } + } + break; + case WM_NCLBUTTONUP: + case WM_LBUTTONUP: + case WM_NCRBUTTONUP: + case WM_RBUTTONUP: + if (m_current && m_current->type != TrackedMenuEntry) + { + msg->message = WM_NULL; } break; case WM_MOUSEMOVE: 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] Wed Jul 9 00:42:05 2014 @@ -63,7 +63,7 @@ return OnPagerCalcSize(reinterpret_cast<LPNMPGCALCSIZE>(hdr)); case TBN_DROPDOWN: - return OnCommand(reinterpret_cast<LPNMTOOLBAR>(hdr)->iItem, 0, theResult); + return ProcessClick(reinterpret_cast<LPNMTOOLBAR>(hdr)->iItem); case TBN_HOTITEMCHANGE: //return OnHotItemChange(reinterpret_cast<LPNMTBHOTITEM>(hdr), theResult); @@ -798,11 +798,10 @@ return m_menuBand->_TrackContextMenu(contextMenu, pt.x, pt.y); } -HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) +HRESULT CMenuToolbarBase::ProcessClick(INT iItem) { if (m_disableMouseTrack) { - *theResult = 1; TRACE("Item click prevented by DisableMouseTrack\n"); return S_OK; } @@ -814,10 +813,6 @@ return S_FALSE; } - *theResult = 0; - - INT iItem = (INT)wParam; - if (PopupItem(iItem, FALSE) == S_OK) { TRACE("PopupItem returned S_OK\n"); @@ -829,28 +824,26 @@ return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); } -HRESULT CMenuToolbarBase::MenuBarMouseDown(INT item) -{ - LRESULT theResult; +HRESULT CMenuToolbarBase::MenuBarMouseDown(INT iIndex) +{ TBBUTTON btn; if (m_initFlags & SMINIT_VERTICAL) return S_OK; - SendMessage(m_hwndToolbar, TB_GETBUTTON, item, reinterpret_cast<LPARAM>(&btn)); - return OnCommand(btn.idCommand, 0, &theResult); -} - -HRESULT CMenuToolbarBase::MenuBarMouseUp(INT item) -{ - LRESULT theResult; + ::SendMessageW(m_hwndToolbar, TB_GETBUTTON, iIndex, reinterpret_cast<LPARAM>(&btn)); + return ProcessClick(btn.idCommand); +} + +HRESULT CMenuToolbarBase::MenuBarMouseUp(INT iIndex) +{ TBBUTTON btn; if (!(m_initFlags & SMINIT_VERTICAL)) return S_OK; - SendMessage(m_hwndToolbar, TB_GETBUTTON, item, reinterpret_cast<LPARAM>(&btn)); - return OnCommand(btn.idCommand, 0, &theResult); + ::SendMessageW(m_hwndToolbar, TB_GETBUTTON, iIndex, reinterpret_cast<LPARAM>(&btn)); + return ProcessClick(btn.idCommand); } HRESULT CMenuToolbarBase::ExecuteItem(INT iItem) 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] Wed Jul 9 00:42:05 2014 @@ -97,8 +97,9 @@ HRESULT KillPopupTimer(); - HRESULT MenuBarMouseDown(INT item); - HRESULT MenuBarMouseUp(INT item); + HRESULT MenuBarMouseDown(INT iIndex); + HRESULT MenuBarMouseUp(INT iIndex); + HRESULT ProcessClick(INT iItem); protected: virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb) = 0; @@ -119,7 +120,6 @@ private: HRESULT UpdateImageLists(); - HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); HRESULT OnPagerCalcSize(LPNMPGCALCSIZE csize); HRESULT OnPopupTimer(DWORD timerId); HRESULT OnContextMenu(NMMOUSE * rclick); 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 Jul 9 00:42:05 2014 @@ -394,7 +394,7 @@ SHCONTF grfFlags, IEnumIDList **ppenumIDList) { - DbgPrint("EnumObjects\n"); + TRACE("EnumObjects\n"); HRESULT hr = m_EnumSource->QueryInterface(IID_PPV_ARG(IEnumIDList, ppenumIDList)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -410,7 +410,7 @@ LocalPidlInfo info; HRESULT hr; - DbgPrint("BindToObject\n"); + TRACE("BindToObject\n"); hr = m_EnumSource->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) @@ -451,7 +451,7 @@ LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { - DbgPrint("CompareIDs\n"); + TRACE("CompareIDs\n"); return m_UserLocal->CompareIDs(lParam, pidl1, pidl2); } @@ -472,7 +472,7 @@ LocalPidlInfo info; HRESULT hr; - DbgPrint("GetAttributesOf\n"); + TRACE("GetAttributesOf\n"); for (int i = 0; i < (int)cidl; i++) { @@ -506,7 +506,7 @@ LocalPidlInfo info; HRESULT hr; - DbgPrint("GetUIObjectOf\n"); + TRACE("GetUIObjectOf\n"); for (int i = 0; i < (int)cidl; i++) { @@ -542,7 +542,7 @@ LocalPidlInfo info; HRESULT hr; - DbgPrint("GetDisplayNameOf\n"); + TRACE("GetDisplayNameOf\n"); hr = m_EnumSource->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) @@ -625,8 +625,24 @@ const SHCOLUMNID *pscid, VARIANT *pv) { - UNIMPLEMENTED; - return E_NOTIMPL; + LocalPidlInfo info; + HRESULT hr; + + TRACE("GetDetailsEx\n"); + + hr = m_EnumSource->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IShellFolder2> parent2; + hr = info.parent->QueryInterface(IID_PPV_ARG(IShellFolder2, &parent2)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = parent2->GetDetailsEx(info.pidl, pscid, pv); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + return S_OK; } HRESULT STDMETHODCALLTYPE CMergedFolder::GetDetailsOf( @@ -634,8 +650,25 @@ UINT iColumn, SHELLDETAILS *psd) { - UNIMPLEMENTED; - return E_NOTIMPL; + LocalPidlInfo info; + HRESULT hr; + + TRACE("GetDetailsOf\n"); + + hr = m_EnumSource->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IShellFolder2> parent2; + hr = info.parent->QueryInterface(IID_PPV_ARG(IShellFolder2, &parent2)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = parent2->GetDetailsOf(info.pidl, iColumn, psd); + + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + return S_OK; } HRESULT STDMETHODCALLTYPE CMergedFolder::MapColumnToSCID( Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Wed Jul 9 00:42:05 2014 @@ -26,7 +26,7 @@ #define WRAP_MENUBAND 0 #define WRAP_TRAYPRIV 0 -#define MERGE_FOLDERS 0 +#define MERGE_FOLDERS 1 #include <stdio.h> #include <tchar.h> 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 Jul 9 00:42:05 2014 @@ -3425,8 +3425,14 @@ { HRESULT hr; IEThreadParamBlock * parameters = (IEThreadParamBlock *) lpThreadParameter; + INITCOMMONCONTROLSEX iccex = + { + sizeof(iccex), + 0xFFFF /* everything! */ + }; OleInitialize(NULL); + InitCommonControlsEx(&iccex); ATLTRY(hr = ExplorerMessageLoop(parameters)); Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Wed Jul 9 00:42:05 2014 @@ -1672,13 +1672,21 @@ const HKEY *ahkeyClsKeys, IContextMenu **ppcm) { + // FIXME: This needs to be freed somewhere (like in the destructor of the context menu) + LPCITEMIDLIST *apidl2 = (LPCITEMIDLIST *) SHAlloc(sizeof(LPCITEMIDLIST) * cidl); + + for (int i = 0; i < cidl; i++) + { + apidl2[i] = apidl[i]; + } + DEFCONTEXTMENU pdcm; pdcm.hwnd = hwnd; pdcm.pcmcb = NULL; pdcm.pidlFolder = pidlFolder; pdcm.psf = psf; pdcm.cidl = cidl; - pdcm.apidl = apidl; + pdcm.apidl = apidl2; pdcm.punkAssociationInfo = NULL; pdcm.cKeys = nKeys; pdcm.aKeys = ahkeyClsKeys; Modified: branches/shell-experiments/dll/win32/shell32/shlmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlmenu.cpp [iso-8859-1] Wed Jul 9 00:42:05 2014 @@ -19,6 +19,8 @@ */ #include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shellmenu); #ifdef FM_SEPARATOR #undef FM_SEPARATOR @@ -55,8 +57,6 @@ static BOOL bAbortInit; #define CCH_MAXITEMTEXT 256 - -WINE_DEFAULT_DEBUG_CHANNEL(shell); static LPFMINFO FM_GetMenuInfo(HMENU hmenu) { @@ -857,6 +857,8 @@ return uIDMax; nItem = GetMenuItemCount(hmDst); + if (nItem == -1) + return uIDMax; if (uInsert >= (UINT)nItem) /* insert position inside menu? */ { @@ -900,16 +902,18 @@ /* This is a separator; don't put two of them in a row */ if (bAlreadySeparated) continue; + bAlreadySeparated = TRUE; } else if (miiSrc.hSubMenu) { - if ((uFlags & MM_SUBMENUSHAVEIDS) != 0 && miiSrc.wID != (UINT)miiSrc.hSubMenu) + if (uFlags & MM_SUBMENUSHAVEIDS) { miiSrc.wID += uIDAdjust; /* add uIDAdjust to the ID */ - if (miiSrc.wID > uIDAdjustMax) /* skip ID's higher uIDAdjustMax */ + if (miiSrc.wID > uIDAdjustMax) /* skip IDs higher than uIDAdjustMax */ continue; + if (uIDMax <= miiSrc.wID) /* remember the highest ID */ uIDMax = miiSrc.wID + 1; } @@ -934,9 +938,9 @@ { miiSrc.wID += uIDAdjust; /* add uIDAdjust to the ID */ - if (miiSrc.wID > uIDAdjustMax) /* skip ID's higher uIDAdjustMax */{ + if (miiSrc.wID > uIDAdjustMax) /* skip IDs higher than uIDAdjustMax */ continue; - } + if (uIDMax <= miiSrc.wID) /* remember the highest ID */ uIDMax = miiSrc.wID + 1;

1 0

[jgardou] 63701: [SETUPAPI_APITEST] - Try restoring UTF8 character which got lost in translation.
by jgardou＠svn.reactos.org 08 Jul '14

08 Jul '14

Author: jgardou Date: Tue Jul 8 22:44:44 2014 New Revision: 63701 URL: http://svn.reactos.org/svn/reactos?rev=63701&view=rev Log: [SETUPAPI_APITEST] - Try restoring UTF8 character which got lost in translation. Modified: trunk/rostests/apitests/setupapi/devclass.c Modified: trunk/rostests/apitests/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/devclas… ============================================================================== --- trunk/rostests/apitests/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/rostests/apitests/setupapi/devclass.c [iso-8859-1] Tue Jul 8 22:44:44 2014 @@ -1,7 +1,7 @@ /* * SetupAPI device class-related functions tests * - * Copyright 2006 Hervï¿½ Poussineau + * Copyright 2006 HervÃ© Poussineau * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public Licence as

1 0

[jgardou] 63700: [NTOSKRNL] - Use ZwSetValueKey instead of NtSetValueKey - Properly probe and copy parameters when NtSetValueKey is called from UMode CORE-7738 #resolve #comment fixed in r63700
by jgardou＠svn.reactos.org 08 Jul '14

08 Jul '14

Author: jgardou Date: Tue Jul 8 18:42:20 2014 New Revision: 63700 URL: http://svn.reactos.org/svn/reactos?rev=63700&view=rev Log: [NTOSKRNL] - Use ZwSetValueKey instead of NtSetValueKey - Properly probe and copy parameters when NtSetValueKey is called from UMode CORE-7738 #resolve #comment fixed in r63700 Modified: trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/io/iomgr/bootlog.c Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] Tue Jul 8 18:42:20 2014 @@ -97,7 +97,7 @@ /* Setup the component information key */ RtlInitUnicodeString(&ValueName, L"Component Information"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -124,7 +124,7 @@ if (NT_SUCCESS(Status)) { /* Save the identifier in the registry */ - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -178,7 +178,7 @@ CmpConfigurationData->BusNumber = BusNumber; /* Save the actual data */ - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_FULL_RESOURCE_DESCRIPTOR, Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Tue Jul 8 18:42:20 2014 @@ -416,7 +416,7 @@ /* Key opened, now write to the key */ RtlInitUnicodeString(&KeyName, L"SystemStartOptions"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &KeyName, 0, REG_SZ, @@ -427,7 +427,7 @@ /* Setup value name for system boot device in ARC format */ RtlInitUnicodeString(&KeyName, L"SystemBootDevice"); RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->ArcBootDeviceName); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &KeyName, 0, REG_SZ, @@ -474,7 +474,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); + Status = ZwOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) { /* ReactOS Hack: Hard-code current to 001 for SetupLdr */ @@ -488,16 +488,17 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey(&KeyHandle, + Status = ZwCreateKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, 0, &Disposition); - if (!NT_SUCCESS(Status)) return Status; - - /* Don't need the handle */ + if (!NT_SUCCESS(Status)) + return Status; + + /* We don't need the handle */ ZwClose(KeyHandle); /* Use hard-coded setting */ @@ -533,7 +534,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey(&KeyHandle, + Status = ZwCreateKey(&KeyHandle, KEY_CREATE_LINK, &ObjectAttributes, 0, @@ -557,7 +558,7 @@ Status = RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); /* Set the value */ - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &CmSymbolicLinkValueName, 0, REG_LINK, @@ -572,7 +573,7 @@ KeyHandle, NULL); Status = NtOpenKey(&ConfigHandle, KEY_READ, &ObjectAttributes); - NtClose(KeyHandle); + ZwClose(KeyHandle); /* Check if we don't have one */ if (!NT_SUCCESS(Status)) @@ -689,7 +690,7 @@ ASSERT(STATUS_SUCCESS == Status); /* Set it */ - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &CmSymbolicLinkValueName, 0, REG_LINK, @@ -2180,7 +2181,7 @@ RtlInitUnicodeString(&ValueData, Buffer); - NtSetValueKey(CurrentVersionKeyHandle, + ZwSetValueKey(CurrentVersionKeyHandle, &ValueName, 0, REG_SZ, Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Tue Jul 8 18:42:20 2014 @@ -268,7 +268,7 @@ /* Set the value */ RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); - NtSetValueKey(KeyHandle, + ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -463,7 +463,7 @@ /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -486,7 +486,7 @@ /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -502,7 +502,7 @@ { /* Add them to the registry */ RtlInitUnicodeString(&ValueName, L"FeatureSet"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -515,7 +515,7 @@ { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"~MHz"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -528,7 +528,7 @@ { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"Update Signature"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -621,7 +621,7 @@ /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -643,7 +643,7 @@ if (NT_SUCCESS(Status)) { /* Save it to the registry */ - Status = NtSetValueKey(BiosHandle, + Status = ZwSetValueKey(BiosHandle, &ValueName, 0, REG_SZ, @@ -703,7 +703,7 @@ /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, @@ -746,7 +746,7 @@ /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -801,7 +801,7 @@ /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Tue Jul 8 18:42:20 2014 @@ -33,7 +33,10 @@ CM_PARSE_CONTEXT ParseContext = {0}; HANDLE Handle; PAGED_CODE(); - DPRINT("NtCreateKey(OB name %wZ)\n", ObjectAttributes->ObjectName); + + DPRINT("NtCreateKey(Path: %wZ, Root %x, Access: %x, CreateOptions %x)\n", + ObjectAttributes->ObjectName, ObjectAttributes->RootDirectory, + DesiredAccess, CreateOptions); /* Check for user-mode caller */ if (PreviousMode != KernelMode) @@ -60,7 +63,8 @@ sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); - if (Disposition) ProbeForWriteUlong(Disposition); + if (Disposition) + ProbeForWriteUlong(Disposition); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -101,6 +105,8 @@ } _SEH2_END; + DPRINT("Returning handle %x, Status %x.\n", Handle, Status); + /* Return status */ return Status; } @@ -116,7 +122,8 @@ NTSTATUS Status; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PAGED_CODE(); - DPRINT("NtOpenKey(OB 0x%wZ)\n", ObjectAttributes->ObjectName); + DPRINT("NtOpenKey(Path: %wZ, Root %x, Access: %x)\n", + ObjectAttributes->ObjectName, ObjectAttributes->RootDirectory, DesiredAccess); /* Check for user-mode caller */ if (PreviousMode != KernelMode) @@ -166,6 +173,8 @@ _SEH2_END; } + DPRINT("Returning handle %x, Status %x.\n", Handle, Status); + /* Return status */ return Status; } @@ -301,6 +310,7 @@ /* Dereference and return status */ ObDereferenceObject(KeyObject); + DPRINT("Returning status %x.\n", Status); return Status; } @@ -604,14 +614,52 @@ IN PVOID Data, IN ULONG DataSize) { - NTSTATUS Status; - PCM_KEY_BODY KeyObject; + NTSTATUS Status = STATUS_SUCCESS; + PCM_KEY_BODY KeyObject = NULL; REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; - UNICODE_STRING ValueNameCopy = *ValueName; + UNICODE_STRING ValueNameCopy; + KPROCESSOR_MODE PreviousMode; + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); + + if (Data && !DataSize) + return STATUS_INVALID_PARAMETER; + + /* Probe and copy the data */ + if ((PreviousMode != KernelMode) && Data) + { + PVOID DataCopy = ExAllocatePoolWithTag(PagedPool, DataSize, TAG_CM); + if (!DataCopy) + return STATUS_NO_MEMORY; + _SEH2_TRY + { + ProbeForRead(Data, DataSize, 1); + RtlCopyMemory(DataCopy, Data, DataSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(DataCopy, TAG_CM); + return Status; + } + Data = DataCopy; + } + + /* Capture the string */ + Status = ProbeAndCaptureUnicodeString(&ValueNameCopy, PreviousMode, ValueName); + if (!NT_SUCCESS(Status)) + goto end; + DPRINT("NtSetValueKey() KH 0x%p, VN '%wZ', TI %x, T %lu, DS %lu\n", - KeyHandle, ValueName, TitleIndex, Type, DataSize); + KeyHandle, &ValueNameCopy, TitleIndex, Type, DataSize); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, @@ -620,7 +668,8 @@ ExGetPreviousMode(), (PVOID*)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + goto end; /* Make sure the name is aligned, not too long, and the data under 4GB */ if ( (ValueNameCopy.Length > 32767) || @@ -628,8 +677,8 @@ (DataSize > 0x80000000)) { /* Fail */ - ObDereferenceObject(KeyObject); - return STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; + goto end; } /* Ignore any null characters at the end */ @@ -644,14 +693,14 @@ if (KeyObject->KeyControlBlock->ExtFlags & CM_KCB_READ_ONLY_KEY) { /* Fail */ - ObDereferenceObject(KeyObject); - return STATUS_ACCESS_DENIED; + Status = STATUS_ACCESS_DENIED; + goto end; } /* Setup callback */ PostOperationInfo.Object = (PVOID)KeyObject; SetValueKeyInfo.Object = (PVOID)KeyObject; - SetValueKeyInfo.ValueName = ValueName; + SetValueKeyInfo.ValueName = &ValueNameCopy; SetValueKeyInfo.TitleIndex = TitleIndex; SetValueKeyInfo.Type = Type; SetValueKeyInfo.Data = Data; @@ -673,8 +722,13 @@ PostOperationInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); +end: /* Dereference and return status */ - ObDereferenceObject(KeyObject); + if (KeyObject) + ObDereferenceObject(KeyObject); + ReleaseCapturedUnicodeString(&ValueNameCopy, PreviousMode); + if ((PreviousMode != KernelMode) && Data) + ExFreePoolWithTag(Data, TAG_CM); return Status; } Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/powerpc/cm… ============================================================================== --- trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] Tue Jul 8 18:42:20 2014 @@ -267,7 +267,7 @@ /* Set the value */ RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); - NtSetValueKey(KeyHandle, + ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -465,7 +465,7 @@ /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -488,7 +488,7 @@ /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -504,7 +504,7 @@ { /* Add them to the registry */ RtlInitUnicodeString(&ValueName, L"FeatureSet"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -517,7 +517,7 @@ { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"~MHz"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -530,7 +530,7 @@ { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"Update Signature"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -623,7 +623,7 @@ /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -645,7 +645,7 @@ if (NT_SUCCESS(Status)) { /* Save it to the registry */ - Status = NtSetValueKey(BiosHandle, + Status = ZwSetValueKey(BiosHandle, &ValueName, 0, REG_SZ, @@ -705,7 +705,7 @@ /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, @@ -749,7 +749,7 @@ /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -804,7 +804,7 @@ /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); - Status = NtSetValueKey(SystemHandle, + Status = ZwSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=637… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Tue Jul 8 18:42:20 2014 @@ -1853,7 +1853,7 @@ { /* Write the safe boot type */ RtlInitUnicodeString(&KeyName, L"OptionValue"); - NtSetValueKey(OptionHandle, + ZwSetValueKey(OptionHandle, &KeyName, 0, REG_DWORD, @@ -1866,7 +1866,7 @@ /* Remember this for later */ Disposition = TRUE; RtlInitUnicodeString(&KeyName, L"UseAlternateShell"); - NtSetValueKey(OptionHandle, + ZwSetValueKey(OptionHandle, &KeyName, 0, REG_DWORD, Modified: trunk/reactos/ntoskrnl/io/iomgr/bootlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/bootlog.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/bootlog.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/bootlog.c [iso-8859-1] Tue Jul 8 18:42:20 2014 @@ -135,7 +135,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); } else {

1 0

[jgardou] 63699: [NTDLL_APITEST] - Add tests for NtDeleteKey
by jgardou＠svn.reactos.org 07 Jul '14

07 Jul '14

Author: jgardou Date: Mon Jul 7 14:46:04 2014 New Revision: 63699 URL: http://svn.reactos.org/svn/reactos?rev=63699&view=rev Log: [NTDLL_APITEST] - Add tests for NtDeleteKey Added: trunk/rostests/apitests/ntdll/NtDeleteKey.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Mon Jul 7 14:46:04 2014 @@ -5,6 +5,7 @@ NtContinue.c NtCreateFile.c NtCreateThread.c + NtDeleteKey.c NtFreeVirtualMemory.c NtMapViewOfSection.c NtMutant.c Added: trunk/rostests/apitests/ntdll/NtDeleteKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtDeleteKe… ============================================================================== --- trunk/rostests/apitests/ntdll/NtDeleteKey.c (added) +++ trunk/rostests/apitests/ntdll/NtDeleteKey.c [iso-8859-1] Mon Jul 7 14:46:04 2014 @@ -0,0 +1,96 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for NtDeleteKey + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> +#include <ndk/cmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/setypes.h> + +static +NTSTATUS +CreateRegistryKeyHandle(PHANDLE KeyHandle, + ACCESS_MASK AccessMask, + PWCHAR RegistryPath) +{ + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES Attributes; + + RtlInitUnicodeString(&KeyName, RegistryPath); + InitializeObjectAttributes(&Attributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + return NtCreateKey(KeyHandle, AccessMask, &Attributes, 0, NULL, REG_OPTION_VOLATILE, 0); +} + +START_TEST(NtDeleteKey) +{ + NTSTATUS Status; + HANDLE ParentKey, ChildKey; + + /* Create a registry key */ + Status = CreateRegistryKeyHandle(&ParentKey, KEY_READ | DELETE, L"\\Registry\\Machine\\Software\\RosTests"); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Create a children registry key */ + Status = CreateRegistryKeyHandle(&ChildKey, KEY_READ | DELETE, L"\\Registry\\Machine\\Software\\RosTests\\Child"); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Try deleting the parent one */ + Status = NtDeleteKey(ParentKey); + ok_ntstatus(Status, STATUS_CANNOT_DELETE); + + /* See what happens with Child one */ + Status = NtDeleteKey(ChildKey); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Retry with parent one */ + Status = NtDeleteKey(ParentKey); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* re-retry */ + Status = NtDeleteKey(ParentKey); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Close everything */ + NtClose(ChildKey); + NtClose(ParentKey); + + /* Same, but this time close the child handle before trying to delete the parent */ + /* Create a registry key */ + Status = CreateRegistryKeyHandle(&ParentKey, KEY_READ | DELETE, L"\\Registry\\Machine\\Software\\RosTests"); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Create a children registry key */ + Status = CreateRegistryKeyHandle(&ChildKey, KEY_READ, L"\\Registry\\Machine\\Software\\RosTests\\Child"); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Close the Child */ + NtClose(ChildKey); + + /* Try deleting the parent one */ + Status = NtDeleteKey(ParentKey); + ok_ntstatus(Status, STATUS_CANNOT_DELETE); + + /* See what happens with Child one */ + Status = CreateRegistryKeyHandle(&ChildKey, DELETE, L"\\Registry\\Machine\\Software\\RosTests\\Child"); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtDeleteKey(ChildKey); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Retry with parent one */ + Status = NtDeleteKey(ParentKey); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Close everything */ + NtClose(ChildKey); + NtClose(ParentKey); +} Propchange: trunk/rostests/apitests/ntdll/NtDeleteKey.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Mon Jul 7 14:46:04 2014 @@ -8,6 +8,7 @@ extern void func_NtContinue(void); extern void func_NtCreateFile(void); extern void func_NtCreateThread(void); +extern void func_NtDeleteKey(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtMapViewOfSection(void); extern void func_NtMutant(void); @@ -38,6 +39,7 @@ { "NtContinue", func_NtContinue }, { "NtCreateFile", func_NtCreateFile }, { "NtCreateThread", func_NtCreateThread }, + { "NtDeleteKey", func_NtDeleteKey }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtMapViewOfSection", func_NtMapViewOfSection }, { "NtMutant", func_NtMutant },

1 0

[spetreolle] 63698: [DBGPRINT] --winetest mode: Use --list to get the tests list. Dedicated to Christoph :)
by spetreolle＠svn.reactos.org 06 Jul '14

06 Jul '14

Author: spetreolle Date: Sun Jul 6 18:09:58 2014 New Revision: 63698 URL: http://svn.reactos.org/svn/reactos?rev=63698&view=rev Log: [DBGPRINT] --winetest mode: Use --list to get the tests list. Dedicated to Christoph :) Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] Sun Jul 6 18:09:58 2014 @@ -43,7 +43,9 @@ FILE *pPipe2; /* get available tests */ - pPipe = _tpopen(argv[2], "r"); + strcpy(cmd, argv[2]); + strcat(cmd, " --list"); + pPipe = _tpopen(cmd, "r"); if (pPipe != NULL) { while(fgets(psBuffer, 128, pPipe))

1 0

[spetreolle] 63697: [DBGPRINT] Convert TABs to spaces.
by spetreolle＠svn.reactos.org 06 Jul '14

06 Jul '14

Author: spetreolle Date: Sun Jul 6 17:36:56 2014 New Revision: 63697 URL: http://svn.reactos.org/svn/reactos?rev=63697&view=rev Log: [DBGPRINT] Convert TABs to spaces. Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] Sun Jul 6 17:36:56 2014 @@ -16,109 +16,109 @@ int _tmain(int argc, TCHAR ** argv) { - TCHAR * buf; - int bufsize; - int i; - int offset; + TCHAR * buf; + int bufsize; + int i; + int offset; - bufsize = 0; - for(i = 1; i < argc; i++) - { - bufsize += _tcslen(argv[i]) + 1; - } + bufsize = 0; + for(i = 1; i < argc; i++) + { + bufsize += _tcslen(argv[i]) + 1; + } - if (!bufsize) - { - return -1; - } + if (!bufsize) + { + return -1; + } - if (_tcsstr(argv[1], "--winetest") && (argc == 3)) - { - char psBuffer[128]; - char psBuffer2[128]; - char *nlptr2; - char cmd[255]; - char test[300]; - FILE *pPipe; - FILE *pPipe2; + if (_tcsstr(argv[1], "--winetest") && (argc == 3)) + { + char psBuffer[128]; + char psBuffer2[128]; + char *nlptr2; + char cmd[255]; + char test[300]; + FILE *pPipe; + FILE *pPipe2; - /* get available tests */ - pPipe = _tpopen(argv[2], "r"); - if (pPipe != NULL) - { - while(fgets(psBuffer, 128, pPipe)) - { - if (psBuffer[0] == ' ') - { - strcpy(cmd, argv[2]); - strcat(cmd, " "); - strcat(cmd, psBuffer+4); - /* run the current test */ - strcpy(test, "\n\nRunning "); - strcat(test, cmd); - OutputDebugStringA(test); - pPipe2 = _popen(cmd, "r"); - if (pPipe2 != NULL) - { - while(fgets(psBuffer2, 128, pPipe2)) - { - nlptr2 = strchr(psBuffer2, '\n'); - if (nlptr2) - *nlptr2 = '\0'; - puts(psBuffer2); - OutputDebugStringA(psBuffer2); - } - _pclose(pPipe2); - } - } - } - _pclose(pPipe); - } - } - else if (_tcsstr(argv[1], "--process") && (argc == 3)) - { - char psBuffer[128]; - FILE *pPipe; + /* get available tests */ + pPipe = _tpopen(argv[2], "r"); + if (pPipe != NULL) + { + while(fgets(psBuffer, 128, pPipe)) + { + if (psBuffer[0] == ' ') + { + strcpy(cmd, argv[2]); + strcat(cmd, " "); + strcat(cmd, psBuffer+4); + /* run the current test */ + strcpy(test, "\n\nRunning "); + strcat(test, cmd); + OutputDebugStringA(test); + pPipe2 = _popen(cmd, "r"); + if (pPipe2 != NULL) + { + while(fgets(psBuffer2, 128, pPipe2)) + { + nlptr2 = strchr(psBuffer2, '\n'); + if (nlptr2) + *nlptr2 = '\0'; + puts(psBuffer2); + OutputDebugStringA(psBuffer2); + } + _pclose(pPipe2); + } + } + } + _pclose(pPipe); + } + } + else if (_tcsstr(argv[1], "--process") && (argc == 3)) + { + char psBuffer[128]; + FILE *pPipe; - pPipe = _tpopen(argv[2], "r"); - if (pPipe != NULL) - { - while(fgets(psBuffer, 128, pPipe)) - { - puts(psBuffer); - OutputDebugStringA(psBuffer); - } - _pclose(pPipe); - } - } - else - { - buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR)); - if (!buf) - { - return -1; - } + pPipe = _tpopen(argv[2], "r"); + if (pPipe != NULL) + { + while(fgets(psBuffer, 128, pPipe)) + { + puts(psBuffer); + OutputDebugStringA(psBuffer); + } + _pclose(pPipe); + } + } + else + { + buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR)); + if (!buf) + { + return -1; + } - offset = 0; - for(i = 1; i < argc; i++) - { - int length = _tcslen(argv[i]); - _tcsncpy(&buf[offset], argv[i], length); - offset += length; - if (i + 1 < argc) - { - buf[offset] = _T(' '); - } - else - { - buf[offset] = _T('\n'); - buf[offset+1] = _T('\0'); - } - offset++; - } - _putts(buf); - OutputDebugString(buf); - HeapFree(GetProcessHeap(), 0, buf); - } - return 0; + offset = 0; + for(i = 1; i < argc; i++) + { + int length = _tcslen(argv[i]); + _tcsncpy(&buf[offset], argv[i], length); + offset += length; + if (i + 1 < argc) + { + buf[offset] = _T(' '); + } + else + { + buf[offset] = _T('\n'); + buf[offset+1] = _T('\0'); + } + offset++; + } + _putts(buf); + OutputDebugString(buf); + HeapFree(GetProcessHeap(), 0, buf); + } + return 0; }

1 0

[ekohl] 63696: [FMIFS] Add Format prototype.
by ekohl＠svn.reactos.org 06 Jul '14

06 Jul '14

Author: ekohl Date: Sun Jul 6 16:13:49 2014 New Revision: 63696 URL: http://svn.reactos.org/svn/reactos?rev=63696&view=rev Log: [FMIFS] Add Format prototype. Modified: trunk/reactos/dll/win32/fmifs/fmifs.spec trunk/reactos/dll/win32/fmifs/format.c trunk/reactos/include/reactos/libs/fmifs/fmifs.h Modified: trunk/reactos/dll/win32/fmifs/fmifs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/fmifs.spec… ============================================================================== --- trunk/reactos/dll/win32/fmifs/fmifs.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/fmifs.spec [iso-8859-1] Sun Jul 6 16:13:49 2014 @@ -4,7 +4,7 @@ @ stdcall DiskCopy() @ stdcall EnableVolumeCompression(wstr long) @ stdcall Extend() -@ stdcall Format() +@ stdcall Format(wstr ptr wstr wstr long ptr) @ stdcall FormatEx(wstr ptr wstr wstr long long ptr) @ stub FormatEx2 @ stdcall InitializeFmIfs(ptr long ptr) Modified: trunk/reactos/dll/win32/fmifs/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/format.c?r… ============================================================================== --- trunk/reactos/dll/win32/fmifs/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/format.c [iso-8859-1] Sun Jul 6 16:13:49 2014 @@ -14,9 +14,14 @@ #include <debug.h> /* FMIFS.6 */ -VOID -NTAPI -Format(VOID) +VOID NTAPI +Format( + IN PWCHAR DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PWCHAR Format, + IN PWCHAR Label, + IN BOOLEAN QuickFormat, + IN PFMIFSCALLBACK Callback) { } Modified: trunk/reactos/include/reactos/libs/fmifs/fmifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fmifs… ============================================================================== --- trunk/reactos/include/reactos/libs/fmifs/fmifs.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fmifs/fmifs.h [iso-8859-1] Sun Jul 6 16:13:49 2014 @@ -133,6 +133,16 @@ /* Format command in FMIFS */ VOID NTAPI +Format( + IN PWCHAR DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PWCHAR Format, + IN PWCHAR Label, + IN BOOLEAN QuickFormat, + IN PFMIFSCALLBACK Callback); + +/* FormatEx command in FMIFS */ +VOID NTAPI FormatEx( IN PWCHAR DriveRoot, IN FMIFS_MEDIA_FLAG MediaFlag,

1 0

[ekohl] 63695: [FORMAT] Rename variables in order to avoid conflicts with the FMIFS.Format function.
by ekohl＠svn.reactos.org 06 Jul '14

06 Jul '14

Author: ekohl Date: Sun Jul 6 15:57:16 2014 New Revision: 63695 URL: http://svn.reactos.org/svn/reactos?rev=63695&view=rev Log: [FORMAT] Rename variables in order to avoid conflicts with the FMIFS.Format function. Modified: trunk/reactos/base/system/format/format.c Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Sun Jul 6 15:57:16 2014 @@ -24,7 +24,7 @@ BOOL GotALabel = FALSE; LPTSTR Label = _T(""); LPTSTR Drive = NULL; -LPTSTR Format = _T("FAT"); +LPTSTR FileSystem = _T("FAT"); TCHAR RootDirectory[MAX_PATH]; TCHAR LabelString[12]; @@ -113,7 +113,7 @@ if( !_tcsnicmp( &argv[i][1], _T("FS:"), 3 )) { if( gotFormat) return -1; - Format = &argv[i][4]; + FileSystem = &argv[i][4]; gotFormat = TRUE; @@ -332,7 +332,7 @@ DWORD flags, maxComponent; ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes; #ifndef UNICODE - WCHAR RootDirectoryW[MAX_PATH], FormatW[MAX_PATH], LabelW[MAX_PATH]; + WCHAR RootDirectoryW[MAX_PATH], FileSystemW[MAX_PATH], LabelW[MAX_PATH]; #endif TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -526,12 +526,12 @@ // #ifndef UNICODE MultiByteToWideChar(CP_ACP, 0, RootDirectory, -1, RootDirectoryW, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, Format, -1, FormatW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, FileSystem, -1, FileSystemW, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, Label, -1, LabelW, MAX_PATH); - FormatEx( RootDirectoryW, media, FormatW, LabelW, QuickFormat, + FormatEx( RootDirectoryW, media, FileSystemW, LabelW, QuickFormat, ClusterSize, FormatExCallback ); #else - FormatEx( RootDirectory, media, Format, Label, QuickFormat, + FormatEx( RootDirectory, media, FileSystem, Label, QuickFormat, ClusterSize, FormatExCallback ); #endif if( Error ) return -1;

1 0

[ekohl] 63694: [FMIFS] Fix indentation and codig style. No code changes!
by ekohl＠svn.reactos.org 06 Jul '14

06 Jul '14

Author: ekohl Date: Sun Jul 6 14:03:04 2014 New Revision: 63694 URL: http://svn.reactos.org/svn/reactos?rev=63694&view=rev Log: [FMIFS] Fix indentation and codig style. No code changes! Modified: trunk/reactos/dll/win32/fmifs/chkdsk.c trunk/reactos/dll/win32/fmifs/compress.c trunk/reactos/dll/win32/fmifs/diskcopy.c trunk/reactos/dll/win32/fmifs/format.c trunk/reactos/dll/win32/fmifs/init.c trunk/reactos/dll/win32/fmifs/media.c trunk/reactos/dll/win32/fmifs/precomp.h trunk/reactos/dll/win32/fmifs/query.c Modified: trunk/reactos/dll/win32/fmifs/chkdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/chkdsk.c?r… ============================================================================== --- trunk/reactos/dll/win32/fmifs/chkdsk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/chkdsk.c [iso-8859-1] Sun Jul 6 14:03:04 2014 @@ -10,25 +10,25 @@ #include "precomp.h" /* FMIFS.1 */ -VOID NTAPI +VOID +NTAPI Chkdsk( - IN PWCHAR DriveRoot, - IN PWCHAR Format, - IN BOOLEAN CorrectErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PVOID Unused2, - IN PVOID Unused3, - IN PFMIFSCALLBACK Callback) + IN PWCHAR DriveRoot, + IN PWCHAR Format, + IN BOOLEAN CorrectErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID Unused2, + IN PVOID Unused3, + IN PFMIFSCALLBACK Callback) { - BOOLEAN Argument = FALSE; + BOOLEAN Argument = FALSE; - /* FAIL immediately */ - Callback( - DONE, /* Command */ - 0, /* DWORD Modifier */ - &Argument);/* Argument */ + /* FAIL immediately */ + Callback(DONE, /* Command */ + 0, /* DWORD Modifier */ + &Argument);/* Argument */ } /* EOF */ Modified: trunk/reactos/dll/win32/fmifs/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/compress.c… ============================================================================== --- trunk/reactos/dll/win32/fmifs/compress.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/compress.c [iso-8859-1] Sun Jul 6 14:03:04 2014 @@ -12,40 +12,38 @@ /* * @implemented */ -BOOLEAN NTAPI +BOOLEAN +NTAPI EnableVolumeCompression( - IN PWCHAR DriveRoot, - IN USHORT Compression) + IN PWCHAR DriveRoot, + IN USHORT Compression) { - HANDLE hFile; - DWORD RetBytes; - BOOL Ret; + HANDLE hFile; + DWORD RetBytes; + BOOL Ret; - hFile = CreateFileW( - DriveRoot, - FILE_READ_DATA | FILE_WRITE_DATA, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS, - NULL); + hFile = CreateFileW(DriveRoot, + FILE_READ_DATA | FILE_WRITE_DATA, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + return FALSE; - if (hFile == INVALID_HANDLE_VALUE) - return FALSE; + Ret = DeviceIoControl(hFile, + FSCTL_SET_COMPRESSION, + &Compression, + sizeof(USHORT), + NULL, + 0, + &RetBytes, + NULL); - Ret = DeviceIoControl( - hFile, - FSCTL_SET_COMPRESSION, - &Compression, - sizeof(USHORT), - NULL, - 0, - &RetBytes, - NULL); + CloseHandle(hFile); - CloseHandle(hFile); - - return (Ret != 0); + return (Ret != 0); } /* EOF */ Modified: trunk/reactos/dll/win32/fmifs/diskcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/diskcopy.c… ============================================================================== --- trunk/reactos/dll/win32/fmifs/diskcopy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/diskcopy.c [iso-8859-1] Sun Jul 6 14:03:04 2014 @@ -10,7 +10,8 @@ #include "precomp.h" /* FMIFS.3 */ -VOID NTAPI +VOID +NTAPI DiskCopy(void) { } Modified: trunk/reactos/dll/win32/fmifs/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/format.c?r… ============================================================================== --- trunk/reactos/dll/win32/fmifs/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/format.c [iso-8859-1] Sun Jul 6 14:03:04 2014 @@ -14,69 +14,69 @@ #include <debug.h> /* FMIFS.6 */ -VOID NTAPI +VOID +NTAPI Format(VOID) { } /* FMIFS.7 */ -VOID NTAPI +VOID +NTAPI FormatEx( - IN PWCHAR DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PWCHAR Format, - IN PWCHAR Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback) + IN PWCHAR DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PWCHAR Format, + IN PWCHAR Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) { - PIFS_PROVIDER Provider; - UNICODE_STRING usDriveRoot; - UNICODE_STRING usLabel; - BOOLEAN Argument = FALSE; - WCHAR VolumeName[MAX_PATH]; - //CURDIR CurDir; + PIFS_PROVIDER Provider; + UNICODE_STRING usDriveRoot; + UNICODE_STRING usLabel; + BOOLEAN Argument = FALSE; + WCHAR VolumeName[MAX_PATH]; + //CURDIR CurDir; - Provider = GetProvider(Format); - if (!Provider) - { - /* Unknown file system */ - Callback( - DONE, /* Command */ - 0, /* DWORD Modifier */ - &Argument); /* Argument */ - return; - } + Provider = GetProvider(Format); + if (!Provider) + { + /* Unknown file system */ + Callback(DONE, /* Command */ + 0, /* DWORD Modifier */ + &Argument); /* Argument */ + return; + } #if 1 - DPRINT1("Warning: use GetVolumeNameForVolumeMountPointW() instead!\n"); - swprintf(VolumeName, L"\\??\\%c:", towupper(DriveRoot[0])); - RtlCreateUnicodeString(&usDriveRoot, VolumeName); - /* Code disabled as long as our storage stack doesn't understand IOCTL_MOUNTDEV_QUERY_DEVICE_NAME */ + DPRINT1("Warning: use GetVolumeNameForVolumeMountPointW() instead!\n"); + swprintf(VolumeName, L"\\??\\%c:", towupper(DriveRoot[0])); + RtlCreateUnicodeString(&usDriveRoot, VolumeName); + /* Code disabled as long as our storage stack doesn't understand IOCTL_MOUNTDEV_QUERY_DEVICE_NAME */ #else - if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, MAX_PATH) - || !RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, &CurDir)) - { - /* Report an error. */ - Callback( - DONE, /* Command */ - 0, /* DWORD Modifier */ - &Argument); /* Argument */ - return; - } + if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, MAX_PATH) || + !RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, &CurDir)) + { + /* Report an error. */ + Callback(DONE, /* Command */ + 0, /* DWORD Modifier */ + &Argument); /* Argument */ + return; + } #endif - RtlInitUnicodeString(&usLabel, Label); + RtlInitUnicodeString(&usLabel, Label); - DPRINT("FormatEx - %S\n", Format); - Provider->FormatEx( - &usDriveRoot, - MediaFlag, - &usLabel, - QuickFormat, - ClusterSize, - Callback); - RtlFreeUnicodeString(&usDriveRoot); + DPRINT("FormatEx - %S\n", Format); + Provider->FormatEx(&usDriveRoot, + MediaFlag, + &usLabel, + QuickFormat, + ClusterSize, + Callback); + + RtlFreeUnicodeString(&usDriveRoot); } /* EOF */ Modified: trunk/reactos/dll/win32/fmifs/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/init.c?rev… ============================================================================== --- trunk/reactos/dll/win32/fmifs/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/init.c [iso-8859-1] Sun Jul 6 14:03:04 2014 @@ -19,167 +19,171 @@ PIFS_PROVIDER GetProvider( - IN PWCHAR FileSystem) + IN PWCHAR FileSystem) { - PLIST_ENTRY ListEntry; - PIFS_PROVIDER Provider; + PLIST_ENTRY ListEntry; + PIFS_PROVIDER Provider; - ListEntry = ProviderListHead.Flink; - while (ListEntry != &ProviderListHead) - { - Provider = CONTAINING_RECORD(ListEntry, IFS_PROVIDER, ListEntry); - if (_wcsicmp(Provider->Name, FileSystem) == 0) - return Provider; - ListEntry = ListEntry->Flink; - } + ListEntry = ProviderListHead.Flink; + while (ListEntry != &ProviderListHead) + { + Provider = CONTAINING_RECORD(ListEntry, IFS_PROVIDER, ListEntry); + if (_wcsicmp(Provider->Name, FileSystem) == 0) + return Provider; + ListEntry = ListEntry->Flink; + } - /* Provider not found */ - return NULL; + /* Provider not found */ + return NULL; } -static BOOLEAN + +static +BOOLEAN AddProvider( - IN PCUNICODE_STRING FileSystem, - IN PWCHAR DllFile) + IN PCUNICODE_STRING FileSystem, + IN PWCHAR DllFile) { - PIFS_PROVIDER Provider = NULL; - ULONG RequiredSize; - HMODULE hMod = NULL; - BOOLEAN ret = FALSE; + PIFS_PROVIDER Provider = NULL; + ULONG RequiredSize; + HMODULE hMod = NULL; + BOOLEAN ret = FALSE; - hMod = LoadLibraryW(DllFile); - if (!hMod) - goto cleanup; + hMod = LoadLibraryW(DllFile); + if (!hMod) + goto cleanup; - RequiredSize = FIELD_OFFSET(IFS_PROVIDER, Name) - + FileSystem->Length + sizeof(UNICODE_NULL); - Provider = (PIFS_PROVIDER)RtlAllocateHeap( - RtlGetProcessHeap(), - 0, - RequiredSize); - if (!Provider) - goto cleanup; - RtlZeroMemory(Provider, RequiredSize); + RequiredSize = FIELD_OFFSET(IFS_PROVIDER, Name) + + FileSystem->Length + sizeof(UNICODE_NULL); + Provider = (PIFS_PROVIDER)RtlAllocateHeap( + RtlGetProcessHeap(), + 0, + RequiredSize); + if (!Provider) + goto cleanup; + RtlZeroMemory(Provider, RequiredSize); - /* Get function pointers */ - Provider->ChkdskEx = (CHKDSKEX)GetProcAddress(hMod, "ChkdskEx"); - //Provider->Extend = (EXTEND)GetProcAddress(hMod, "Extend"); - Provider->FormatEx = (FORMATEX)GetProcAddress(hMod, "FormatEx"); + /* Get function pointers */ + Provider->ChkdskEx = (CHKDSKEX)GetProcAddress(hMod, "ChkdskEx"); + //Provider->Extend = (EXTEND)GetProcAddress(hMod, "Extend"); + Provider->FormatEx = (FORMATEX)GetProcAddress(hMod, "FormatEx"); - RtlCopyMemory(Provider->Name, FileSystem->Buffer, FileSystem->Length); + RtlCopyMemory(Provider->Name, FileSystem->Buffer, FileSystem->Length); - InsertTailList(&ProviderListHead, &Provider->ListEntry); - ret = TRUE; + InsertTailList(&ProviderListHead, &Provider->ListEntry); + ret = TRUE; cleanup: - if (!ret) - { - if (hMod) - FreeLibrary(hMod); - if (Provider) - RtlFreeHeap(RtlGetProcessHeap(), 0, Provider); - } - return ret; + if (!ret) + { + if (hMod) + FreeLibrary(hMod); + if (Provider) + RtlFreeHeap(RtlGetProcessHeap(), 0, Provider); + } + return ret; } -static BOOLEAN -InitializeFmIfsOnce(void) +static +BOOLEAN +InitializeFmIfsOnce(VOID) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING RegistryPath - = RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\SOFTWARE\\ReactOS\\ReactOS\\CurrentVersion\\IFS"); - HANDLE hKey = NULL; - PKEY_VALUE_FULL_INFORMATION Buffer; - ULONG BufferSize = sizeof(KEY_VALUE_FULL_INFORMATION) + MAX_PATH; - ULONG RequiredSize; - ULONG i = 0; - UNICODE_STRING Name; - UNICODE_STRING Data; - NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING RegistryPath + = RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\SOFTWARE\\ReactOS\\ReactOS\\CurrentVersion\\IFS"); + HANDLE hKey = NULL; + PKEY_VALUE_FULL_INFORMATION Buffer; + ULONG BufferSize = sizeof(KEY_VALUE_FULL_INFORMATION) + MAX_PATH; + ULONG RequiredSize; + ULONG i = 0; + UNICODE_STRING Name; + UNICODE_STRING Data; + NTSTATUS Status; - InitializeListHead(&ProviderListHead); + InitializeListHead(&ProviderListHead); - /* Read IFS providers from HKLM\SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS */ - InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, 0, NULL, NULL); - Status = NtOpenKey(&hKey, KEY_QUERY_VALUE, &ObjectAttributes); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - return TRUE; - else if (!NT_SUCCESS(Status)) - return FALSE; + /* Read IFS providers from HKLM\SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS */ + InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, 0, NULL, NULL); + Status = NtOpenKey(&hKey, KEY_QUERY_VALUE, &ObjectAttributes); + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + return TRUE; + else if (!NT_SUCCESS(Status)) + return FALSE; - Buffer = (PKEY_VALUE_FULL_INFORMATION)RtlAllocateHeap( - RtlGetProcessHeap(), - 0, - BufferSize); - if (!Buffer) - { - NtClose(hKey); - return FALSE; - } + Buffer = (PKEY_VALUE_FULL_INFORMATION)RtlAllocateHeap( + RtlGetProcessHeap(), + 0, + BufferSize); + if (!Buffer) + { + NtClose(hKey); + return FALSE; + } - while (TRUE) - { - Status = NtEnumerateValueKey( - hKey, - i++, - KeyValueFullInformation, - Buffer, - BufferSize, - &RequiredSize); - if (Status == STATUS_BUFFER_OVERFLOW) - continue; - else if (!NT_SUCCESS(Status)) - break; - else if (Buffer->Type != REG_SZ) - continue; + while (TRUE) + { + Status = NtEnumerateValueKey( + hKey, + i++, + KeyValueFullInformation, + Buffer, + BufferSize, + &RequiredSize); + if (Status == STATUS_BUFFER_OVERFLOW) + continue; + else if (!NT_SUCCESS(Status)) + break; + else if (Buffer->Type != REG_SZ) + continue; - Name.Length = Name.MaximumLength = Buffer->NameLength; - Name.Buffer = Buffer->Name; - Data.Length = Data.MaximumLength = Buffer->DataLength; - Data.Buffer = (PWCHAR)((ULONG_PTR)Buffer + Buffer->DataOffset); - if (Data.Length > sizeof(WCHAR) && Data.Buffer[Data.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) - Data.Length -= sizeof(WCHAR); + Name.Length = Name.MaximumLength = Buffer->NameLength; + Name.Buffer = Buffer->Name; + Data.Length = Data.MaximumLength = Buffer->DataLength; + Data.Buffer = (PWCHAR)((ULONG_PTR)Buffer + Buffer->DataOffset); + if (Data.Length > sizeof(WCHAR) && Data.Buffer[Data.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) + Data.Length -= sizeof(WCHAR); - AddProvider(&Name, Data.Buffer); - } + AddProvider(&Name, Data.Buffer); + } - NtClose(hKey); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return TRUE; + NtClose(hKey); + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + return TRUE; } /* FMIFS.8 */ -BOOLEAN NTAPI +BOOLEAN +NTAPI InitializeFmIfs( - IN PVOID hinstDll, - IN DWORD dwReason, - IN PVOID reserved) + IN PVOID hinstDll, + IN DWORD dwReason, + IN PVOID reserved) { - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - if (FALSE == FmIfsInitialized) - { - if (FALSE == InitializeFmIfsOnce()) - { - return FALSE; - } + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + if (FmIfsInitialized == FALSE) + { + if (InitializeFmIfsOnce() == FALSE) + { + return FALSE; + } - FmIfsInitialized = TRUE; - } - break; + FmIfsInitialized = TRUE; + } + break; - case DLL_THREAD_ATTACH: - break; + case DLL_THREAD_ATTACH: + break; - case DLL_THREAD_DETACH: - break; + case DLL_THREAD_DETACH: + break; - case DLL_PROCESS_DETACH: - break; - } + case DLL_PROCESS_DETACH: + break; + } - return TRUE; + return TRUE; } /* EOF */ Modified: trunk/reactos/dll/win32/fmifs/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/media.c?re… ============================================================================== --- trunk/reactos/dll/win32/fmifs/media.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/media.c [iso-8859-1] Sun Jul 6 14:03:04 2014 @@ -10,14 +10,15 @@ #include "precomp.h" /* FMIFS.9 */ -BOOL NTAPI +BOOL +NTAPI QuerySupportedMedia( - IN PWCHAR DriveRoot, - OUT FMIFS_MEDIA_FLAG *CurrentMedia OPTIONAL, - IN ULONG Unknown3, - OUT PULONG Unknown4) + IN PWCHAR DriveRoot, + OUT FMIFS_MEDIA_FLAG *CurrentMedia OPTIONAL, + IN ULONG Unknown3, + OUT PULONG Unknown4) { - return FALSE; + return FALSE; } /* EOF */ Modified: trunk/reactos/dll/win32/fmifs/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] Sun Jul 6 14:03:04 2014 @@ -32,18 +32,18 @@ typedef struct _IFS_PROVIDER { - LIST_ENTRY ListEntry; + LIST_ENTRY ListEntry; - CHKDSKEX ChkdskEx; - PVOID Extend; - FORMATEX FormatEx; + CHKDSKEX ChkdskEx; + PVOID Extend; + FORMATEX FormatEx; - WCHAR Name[1]; + WCHAR Name[1]; } IFS_PROVIDER, *PIFS_PROVIDER; /* init.c */ PIFS_PROVIDER GetProvider( - IN PWCHAR FileSytem); + IN PWCHAR FileSytem); #endif /* _FMIFS_PCH_ */ Modified: trunk/reactos/dll/win32/fmifs/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/query.c?re… ============================================================================== --- trunk/reactos/dll/win32/fmifs/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/query.c [iso-8859-1] Sun Jul 6 14:03:04 2014 @@ -9,36 +9,37 @@ #include "precomp.h" -BOOLEAN NTAPI +BOOLEAN +NTAPI QueryAvailableFileSystemFormat( - IN DWORD Index, - IN OUT PWCHAR FileSystem, /* FIXME: Probably one minimal size is mandatory, but which one? */ - OUT UCHAR* Major, - OUT UCHAR* Minor, - OUT BOOLEAN* LatestVersion) + IN DWORD Index, + IN OUT PWCHAR FileSystem, /* FIXME: Probably one minimal size is mandatory, but which one? */ + OUT UCHAR *Major, + OUT UCHAR *Minor, + OUT BOOLEAN *LatestVersion) { - PLIST_ENTRY ListEntry; - PIFS_PROVIDER Provider; + PLIST_ENTRY ListEntry; + PIFS_PROVIDER Provider; - if (!FileSystem || !Major ||!Minor ||!LatestVersion) - return FALSE; + if (!FileSystem || !Major ||!Minor ||!LatestVersion) + return FALSE; - ListEntry = ProviderListHead.Flink; - while (TRUE) - { - if (ListEntry == &ProviderListHead) - return FALSE; - if (Index == 0) - break; - ListEntry = ListEntry->Flink; - Index--; - } + ListEntry = ProviderListHead.Flink; + while (TRUE) + { + if (ListEntry == &ProviderListHead) + return FALSE; + if (Index == 0) + break; + ListEntry = ListEntry->Flink; + Index--; + } - Provider = CONTAINING_RECORD(ListEntry, IFS_PROVIDER, ListEntry); - wcscpy(FileSystem, Provider->Name); - *Major = 0; /* FIXME */ - *Minor = 0; /* FIXME */ - *LatestVersion = TRUE; /* FIXME */ + Provider = CONTAINING_RECORD(ListEntry, IFS_PROVIDER, ListEntry); + wcscpy(FileSystem, Provider->Name); + *Major = 0; /* FIXME */ + *Minor = 0; /* FIXME */ + *LatestVersion = TRUE; /* FIXME */ - return TRUE; + return TRUE; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs