Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 69321: [DEVMGR] - A few cmake fixes
by gedmurphy＠svn.reactos.org 22 Sep '15

22 Sep '15

Author: gedmurphy Date: Tue Sep 22 21:44:19 2015 New Revision: 69321 URL: http://svn.reactos.org/svn/reactos?rev=69321&view=rev Log: [DEVMGR] - A few cmake fixes Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp trunk/reactos/dll/win32/devmgr_new/properties/properties.h trunk/reactos/dll/win32/devmgr_new/stdafx.h Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -3,7 +3,10 @@ set_cpp(WITH_RTTI WITH_RUNTIME) -include_directories(${REACTOS_SOURCE_DIR}/lib/atl includes devmgmt) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/dll + ${REACTOS_SOURCE_DIR}/lib/atl + includes) list(APPEND SOURCE stdafx.h @@ -13,7 +16,6 @@ properties/hwpage.cpp properties/hwresource.cpp properties/misc.cpp - properties/stubs.cpp devmgmt/ClassNode.cpp devmgmt/DeviceNode.cpp devmgmt/DeviceView.cpp @@ -30,4 +32,5 @@ set_module_type(devmgr win32dll UNICODE) target_link_libraries(devmgr uuid atlnew wine) add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version msvcrt kernel32 ole32 uxtheme ntdll) +add_pch(devmgr stdafx.h SOURCE) add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -28,7 +28,7 @@ */ #include "stdafx.h" -#include <devmgr\devmgr.h>" +#include <devmgr\devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -26,7 +26,7 @@ */ #include "stdafx.h" -#include <devmgr\devmgr.h>" +#include <devmgr\devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -26,7 +26,7 @@ */ #include "stdafx.h" -#include <devmgr\devmgr.h>" +#include <devmgr\devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -8,7 +8,7 @@ */ #include "stdafx.h" -#include <devmgr\devmgr.h>" +#include <devmgr\devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -26,7 +26,7 @@ */ #include "stdafx.h" -#include <devmgr\devmgr.h>" +#include <devmgr\devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr_new/properties/properties.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/properties.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/properties.h [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -1,7 +1,7 @@ #ifndef __DEVMGR_H #define __DEVMGR_H -//WINE_DEFAULT_DEBUG_CHANNEL(devmgr); +WINE_DEFAULT_DEBUG_CHANNEL(devmgr); extern HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/devmgr_new/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/stdaf… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/stdafx.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/stdafx.h [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -53,6 +53,8 @@ #include <process.h> #include <WindowsX.h> #include <strsafe.h> +#include <regstr.h> +#include <newdevp.h> #include <setupapi.h> #include <commctrl.h> @@ -64,4 +66,8 @@ #include <atlstr.h> #include <atlcoll.h> +#include <wine/debug.h> + +//WINE_DEFAULT_DEBUG_CHANNEL(devmgr); + #endif

1 0

[gedmurphy] 69320: [DEVMGR] - Build the properties as C++ - Rearrange the folder structure - The whole thing now builds and runs from VS (with a few hacks). CMake next
by gedmurphy＠svn.reactos.org 22 Sep '15

22 Sep '15

Author: gedmurphy Date: Tue Sep 22 18:23:03 2015 New Revision: 69320 URL: http://svn.reactos.org/svn/reactos?rev=69320&view=rev Log: [DEVMGR] - Build the properties as C++ - Rearrange the folder structure - The whole thing now builds and runs from VS (with a few hacks). CMake next Added: trunk/reactos/dll/win32/devmgr_new/api.cpp (with props) trunk/reactos/dll/win32/devmgr_new/includes/devmgr.h (with props) trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp - copied, changed from r69254, trunk/reactos/dll/win32/devmgr_new/properties/advprop.c trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp - copied, changed from r69254, trunk/reactos/dll/win32/devmgr_new/properties/devprblm.c trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp - copied, changed from r69254, trunk/reactos/dll/win32/devmgr_new/properties/hwpage.c trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp - copied, changed from r69254, trunk/reactos/dll/win32/devmgr_new/properties/hwresource.c trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp - copied, changed from r69254, trunk/reactos/dll/win32/devmgr_new/properties/misc.c trunk/reactos/dll/win32/devmgr_new/properties/properties.h (with props) trunk/reactos/dll/win32/devmgr_new/properties/stubs.cpp - copied, changed from r69254, trunk/reactos/dll/win32/devmgr_new/properties/stubs.c trunk/reactos/dll/win32/devmgr_new/stdafx.h (with props) Removed: trunk/reactos/dll/win32/devmgr_new/api.c trunk/reactos/dll/win32/devmgr_new/devmgmt/stdafx.h trunk/reactos/dll/win32/devmgr_new/precomp.h trunk/reactos/dll/win32/devmgr_new/properties/advprop.c trunk/reactos/dll/win32/devmgr_new/properties/devprblm.c trunk/reactos/dll/win32/devmgr_new/properties/hwpage.c trunk/reactos/dll/win32/devmgr_new/properties/hwresource.c trunk/reactos/dll/win32/devmgr_new/properties/misc.c trunk/reactos/dll/win32/devmgr_new/properties/stubs.c Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr_new/devmgr.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake… Removed: trunk/reactos/dll/win32/devmgr_new/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/api.c… Added: trunk/reactos/dll/win32/devmgr_new/api.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/api.c… Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… Modified: trunk/reactos/dll/win32/devmgr_new/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… Added: trunk/reactos/dll/win32/devmgr_new/includes/devmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/inclu… Removed: trunk/reactos/dll/win32/devmgr_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/preco… Removed: trunk/reactos/dll/win32/devmgr_new/properties/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Copied: trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp (from r69254, trunk/reactos/dll/win32/devmgr_new/properties/advprop.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Removed: trunk/reactos/dll/win32/devmgr_new/properties/devprblm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Copied: trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp (from r69254, trunk/reactos/dll/win32/devmgr_new/properties/devprblm.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Removed: trunk/reactos/dll/win32/devmgr_new/properties/hwpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Copied: trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp (from r69254, trunk/reactos/dll/win32/devmgr_new/properties/hwpage.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Removed: trunk/reactos/dll/win32/devmgr_new/properties/hwresource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Copied: trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp (from r69254, trunk/reactos/dll/win32/devmgr_new/properties/hwresource.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Removed: trunk/reactos/dll/win32/devmgr_new/properties/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Copied: trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp (from r69254, trunk/reactos/dll/win32/devmgr_new/properties/misc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Added: trunk/reactos/dll/win32/devmgr_new/properties/properties.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Removed: trunk/reactos/dll/win32/devmgr_new/properties/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Copied: trunk/reactos/dll/win32/devmgr_new/properties/stubs.cpp (from r69254, trunk/reactos/dll/win32/devmgr_new/properties/stubs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… Added: trunk/reactos/dll/win32/devmgr_new/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/stdaf…

1 0

[gadamopoulos] 69319: [SHELL32] - Add a helper HCR_GetClassName function to load the name of a reg folder to a STRRET - Further simplify CAdminToolsFolder, CFontsFolder and CMyDocsFolder
by gadamopoulos＠svn.reactos.org 22 Sep '15

22 Sep '15

Author: gadamopoulos Date: Tue Sep 22 18:11:32 2015 New Revision: 69319 URL: http://svn.reactos.org/svn/reactos?rev=69319&view=rev Log: [SHELL32] - Add a helper HCR_GetClassName function to load the name of a reg folder to a STRRET - Further simplify CAdminToolsFolder, CFontsFolder and CMyDocsFolder Modified: trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.h trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFontsFolder.h trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.h trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp [iso-8859-1] Tue Sep 22 18:11:32 2015 @@ -23,43 +23,22 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); -/* -This folder should not exist. It is just a file system folder... -*/ - -/* List shortcuts of - * CSIDL_COMMON_ADMINTOOLS - * Note: CSIDL_ADMINTOOLS is ignored, tested with Window XP SP3+ - */ - -/*********************************************************************** - * AdminTools folder implementation - */ - CAdminToolsFolder::CAdminToolsFolder() { m_pisfInner = NULL; - m_pisf2Inner = NULL; - - szTarget = NULL; } CAdminToolsFolder::~CAdminToolsFolder() { - HeapFree(GetProcessHeap(), 0, szTarget); m_pisfInner.Release(); - m_pisf2Inner.Release(); } HRESULT WINAPI CAdminToolsFolder::FinalConstruct() { HRESULT hr; CComPtr<IPersistFolder3> ppf3; - hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder, &m_pisfInner)); - if (FAILED(hr)) - return hr; - - hr = m_pisfInner->QueryInterface(IID_PPV_ARG(IShellFolder2, &m_pisf2Inner)); + + hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder2, &m_pisfInner)); if (FAILED(hr)) return hr; @@ -67,18 +46,16 @@ if (FAILED(hr)) return hr; + LPITEMIDLIST pidlRoot = _ILCreateAdminTools(); + PERSIST_FOLDER_TARGET_INFO info; ZeroMemory(&info, sizeof(PERSIST_FOLDER_TARGET_INFO)); info.csidl = CSIDL_COMMON_ADMINTOOLS; - hr = ppf3->InitializeEx(NULL, _ILCreateAdminTools(), &info); - - szTarget = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (szTarget == NULL) - return E_OUTOFMEMORY; - if (!SHGetSpecialFolderPathW(NULL, szTarget, CSIDL_COMMON_ADMINTOOLS, FALSE)) - return E_FAIL; - - return S_OK; + hr = ppf3->InitializeEx(NULL, pidlRoot, &info); + + SHFree(pidlRoot); + + return hr; } HRESULT WINAPI CAdminToolsFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, @@ -117,28 +94,22 @@ static const DWORD dwAdminToolsAttributes = SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; - + if(cidl) - { return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); - } - else - { - if (!rgfInOut) - return E_INVALIDARG; - if (cidl && !apidl) - return E_INVALIDARG; - - if (*rgfInOut == 0) - *rgfInOut = ~0; - - *rgfInOut &= dwAdminToolsAttributes; - - /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ - *rgfInOut &= ~SFGAO_VALIDATE; - - return S_OK; - } + + if (!rgfInOut || !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + *rgfInOut &= dwAdminToolsAttributes; + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + return S_OK; } HRESULT WINAPI CAdminToolsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, @@ -149,43 +120,25 @@ HRESULT WINAPI CAdminToolsFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { + if (!strRet || !pidl) + return E_INVALIDARG; + + /* If we got an fs item just forward to the fs folder */ if (!_ILIsSpecialFolder(pidl)) return m_pisfInner->GetDisplayNameOf(pidl, dwFlags, strRet); - HRESULT hr = S_OK; - LPWSTR pszPath; - - TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet); - pdump (pidl); - - if (!strRet) - return E_INVALIDARG; - - pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); - if (!pszPath) - return E_OUTOFMEMORY; - - ZeroMemory(pszPath, (MAX_PATH + 1) * sizeof(WCHAR)); - - if (!pidl->mkid.cb) + /* The caller wants our path. Let fs folder handle it */ + if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && + (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) { - if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && - (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) - wcscpy(pszPath, szTarget); - else if (!HCR_GetClassNameW(CLSID_AdminFolderShortcut, pszPath, MAX_PATH)) - hr = E_FAIL; + /* Give an empty pidl to the fs folder to make it tell us its path */ + if (pidl->mkid.cb) + pidl = ILGetNext(pidl); + return m_pisfInner->GetDisplayNameOf(pidl, dwFlags, strRet); } - if (SUCCEEDED(hr)) - { - strRet->uType = STRRET_WSTR; - strRet->pOleStr = pszPath; - TRACE ("-- (%p)->(%s,0x%08x)\n", this, debugstr_w(strRet->pOleStr), hr); - } - else - CoTaskMemFree(pszPath); - - return hr; + /* Return the display name from the registry */ + return HCR_GetClassName(CLSID_AdminFolderShortcut, strRet); } HRESULT WINAPI CAdminToolsFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /* simple pidl */ @@ -196,66 +149,58 @@ HRESULT WINAPI CAdminToolsFolder::GetDefaultSearchGUID(GUID *pguid) { - return m_pisf2Inner->GetDefaultSearchGUID(pguid); + return m_pisfInner->GetDefaultSearchGUID(pguid); } HRESULT WINAPI CAdminToolsFolder::EnumSearches(IEnumExtraSearch ** ppenum) { - return m_pisf2Inner->EnumSearches(ppenum); + return m_pisfInner->EnumSearches(ppenum); } HRESULT WINAPI CAdminToolsFolder::GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay) { - return m_pisf2Inner->GetDefaultColumn(dwRes, pSort, pDisplay); + return m_pisfInner->GetDefaultColumn(dwRes, pSort, pDisplay); } HRESULT WINAPI CAdminToolsFolder::GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags) { - return m_pisf2Inner->GetDefaultColumnState(iColumn, pcsFlags); + return m_pisfInner->GetDefaultColumnState(iColumn, pcsFlags); } HRESULT WINAPI CAdminToolsFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { - return m_pisf2Inner->GetDetailsEx(pidl, pscid, pv); + return m_pisfInner->GetDetailsEx(pidl, pscid, pv); } HRESULT WINAPI CAdminToolsFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { - return m_pisf2Inner->GetDetailsOf(pidl, iColumn, psd); + return m_pisfInner->GetDetailsOf(pidl, iColumn, psd); } HRESULT WINAPI CAdminToolsFolder::MapColumnToSCID(UINT column, SHCOLUMNID *pscid) { - return m_pisf2Inner->MapColumnToSCID(column, pscid); -} - -/************************************************************************ - * CAdminToolsFolder::GetClassID - */ + return m_pisfInner->MapColumnToSCID(column, pscid); +} + HRESULT WINAPI CAdminToolsFolder::GetClassID(CLSID *lpClassId) { - TRACE ("(%p)\n", this); + if (!lpClassId) + return E_POINTER; memcpy(lpClassId, &CLSID_AdminFolderShortcut, sizeof(CLSID)); return S_OK; } -/************************************************************************ - * CAdminToolsFolder::Initialize - * - */ HRESULT WINAPI CAdminToolsFolder::Initialize(LPCITEMIDLIST pidl) { return S_OK; } -/************************************************************************** - * CAdminToolsFolder::GetCurFolder - */ HRESULT WINAPI CAdminToolsFolder::GetCurFolder(LPITEMIDLIST *pidl) { - CComPtr<IPersistFolder2> ppf2; - m_pisfInner->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); - return ppf2->GetCurFolder(pidl); -} + if (!pidl) + return E_POINTER; + *pidl = _ILCreateAdminTools(); + return S_OK; +} Modified: trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.h [iso-8859-1] Tue Sep 22 18:11:32 2015 @@ -29,10 +29,8 @@ public IPersistFolder2 { private: - CComPtr<IShellFolder> m_pisfInner; - CComPtr<IShellFolder2> m_pisf2Inner; - LPWSTR szTarget; - public: + CComPtr<IShellFolder2> m_pisfInner; + public: CAdminToolsFolder(); ~CAdminToolsFolder(); HRESULT WINAPI FinalConstruct(); Modified: trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp [iso-8859-1] Tue Sep 22 18:11:32 2015 @@ -23,46 +23,20 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); -/* -This folder should not exist. It is just a file system folder... The \windows\fonts -directory contains a hidden desktop.ini with a UIHandler entry that specifies a class -that lives in fontext.dll. The UI handler creates a custom view for the folder, which -is what we normally see. However, the folder is a perfectly normal CFSFolder. -*/ - -/*********************************************************************** -* IShellFolder implementation -*/ - CFontsFolder::CFontsFolder() { m_pisfInner = NULL; - m_pisf2Inner = NULL; - - pidlRoot = NULL; - apidl = NULL; } CFontsFolder::~CFontsFolder() { - TRACE("-- destroying IShellFolder(%p)\n", this); - SHFree(pidlRoot); -} - -static LPITEMIDLIST _ILCreateFont(void) -{ - return _ILCreateGuid(PT_GUID, CLSID_FontsFolderShortcut); } HRESULT WINAPI CFontsFolder::FinalConstruct() { HRESULT hr; CComPtr<IPersistFolder3> ppf3; - hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder, &m_pisfInner)); - if (FAILED(hr)) - return hr; - - hr = m_pisfInner->QueryInterface(IID_PPV_ARG(IShellFolder2, &m_pisf2Inner)); + hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder2, &m_pisfInner)); if (FAILED(hr)) return hr; @@ -70,11 +44,17 @@ if (FAILED(hr)) return hr; + LPITEMIDLIST pidl = _ILCreateGuid(PT_GUID, CLSID_FontsFolderShortcut); + if (!pidl) + return E_OUTOFMEMORY; + PERSIST_FOLDER_TARGET_INFO info; ZeroMemory(&info, sizeof(PERSIST_FOLDER_TARGET_INFO)); info.csidl = CSIDL_FONTS; - hr = ppf3->InitializeEx(NULL, _ILCreateFont(), &info); - + hr = ppf3->InitializeEx(NULL, pidl, &info); + + ILFree(pidl); + return hr; } @@ -114,28 +94,22 @@ static const DWORD dwFontsAttributes = SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; - + if(cidl) - { return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); - } - else - { - if (!rgfInOut) - return E_INVALIDARG; - if (cidl && !apidl) - return E_INVALIDARG; - - if (*rgfInOut == 0) - *rgfInOut = ~0; - - *rgfInOut &= dwFontsAttributes; - - /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ - *rgfInOut &= ~SFGAO_VALIDATE; - - return S_OK; - } + + if (!rgfInOut || !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + *rgfInOut &= dwFontsAttributes; + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + return S_OK; } HRESULT WINAPI CFontsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, @@ -146,39 +120,26 @@ HRESULT WINAPI CFontsFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { + if (!strRet || !pidl) + return E_INVALIDARG; + + /* If we got an fs item just forward to the fs folder */ if (!_ILIsSpecialFolder(pidl)) return m_pisfInner->GetDisplayNameOf(pidl, dwFlags, strRet); - TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet); - pdump (pidl); - - if (!strRet) - return E_INVALIDARG; - -if (!pidl->mkid.cb) + /* The caller wants our path. Let fs folder handle it */ + if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && + (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) { - WCHAR wszPath[MAX_PATH]; - - if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && - (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) - { - if (!SHGetSpecialFolderPathW(NULL, wszPath, CSIDL_FONTS, FALSE)) - return E_FAIL; - } - else if (!HCR_GetClassNameW(CLSID_FontsFolderShortcut, wszPath, MAX_PATH)) - return E_FAIL; - - strRet->pOleStr = (LPWSTR)CoTaskMemAlloc((wcslen(wszPath) + 1) * sizeof(WCHAR)); - if (!strRet->pOleStr) - return E_OUTOFMEMORY; - - wcscpy(strRet->pOleStr, wszPath); - strRet->uType = STRRET_WSTR; - - return S_OK; + /* Give an empty pidl to the fs folder to tell us its path */ + if (pidl->mkid.cb) + pidl = ILGetNext(pidl); + + return m_pisfInner->GetDisplayNameOf(pidl, dwFlags, strRet); } - else - return E_INVALIDARG; + + /* Return the display name from the registry */ + return HCR_GetClassName(CLSID_FontsFolderShortcut, strRet); } HRESULT WINAPI CFontsFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /* simple pidl */ @@ -189,46 +150,41 @@ HRESULT WINAPI CFontsFolder::GetDefaultSearchGUID(GUID *pguid) { - return m_pisf2Inner->GetDefaultSearchGUID(pguid); + return m_pisfInner->GetDefaultSearchGUID(pguid); } HRESULT WINAPI CFontsFolder::EnumSearches(IEnumExtraSearch ** ppenum) { - return m_pisf2Inner->EnumSearches(ppenum); + return m_pisfInner->EnumSearches(ppenum); } HRESULT WINAPI CFontsFolder::GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay) { - return m_pisf2Inner->GetDefaultColumn(dwRes, pSort, pDisplay); + return m_pisfInner->GetDefaultColumn(dwRes, pSort, pDisplay); } HRESULT WINAPI CFontsFolder::GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags) { - return m_pisf2Inner->GetDefaultColumnState(iColumn, pcsFlags); + return m_pisfInner->GetDefaultColumnState(iColumn, pcsFlags); } HRESULT WINAPI CFontsFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { - return m_pisf2Inner->GetDetailsEx(pidl, pscid, pv); + return m_pisfInner->GetDetailsEx(pidl, pscid, pv); } HRESULT WINAPI CFontsFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { - return m_pisf2Inner->GetDetailsOf(pidl, iColumn, psd); + return m_pisfInner->GetDetailsOf(pidl, iColumn, psd); } HRESULT WINAPI CFontsFolder::MapColumnToSCID(UINT column, SHCOLUMNID *pscid) { - return m_pisf2Inner->MapColumnToSCID(column, pscid); -} - -/************************************************************************ - * CFontsFolder::GetClassID - */ + return m_pisfInner->MapColumnToSCID(column, pscid); +} + HRESULT WINAPI CFontsFolder::GetClassID(CLSID *lpClassId) { - TRACE ("(%p)\n", this); - if (!lpClassId) return E_POINTER; @@ -237,29 +193,17 @@ return S_OK; } -/************************************************************************ - * CFontsFolder::Initialize - * - * NOTES: it makes no sense to change the pidl - */ HRESULT WINAPI CFontsFolder::Initialize(LPCITEMIDLIST pidl) { - TRACE ("(%p)->(%p)\n", this, pidl); - - return S_OK; -} - -/************************************************************************** - * CFontsFolder::GetCurFolder - */ + return S_OK; +} + HRESULT WINAPI CFontsFolder::GetCurFolder(LPITEMIDLIST *pidl) { - TRACE ("(%p)->(%p)\n", this, pidl); - if (!pidl) return E_POINTER; - *pidl = ILClone(pidlRoot); - - return S_OK; -} + *pidl = _ILCreateGuid(PT_GUID, CLSID_FontsFolderShortcut); + + return S_OK; +} Modified: trunk/reactos/dll/win32/shell32/folders/CFontsFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFontsFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFontsFolder.h [iso-8859-1] Tue Sep 22 18:11:32 2015 @@ -29,12 +29,7 @@ public IPersistFolder2 { private: - CComPtr<IShellFolder> m_pisfInner; - CComPtr<IShellFolder2> m_pisf2Inner; - - /* both paths are parsible from the desktop */ - LPITEMIDLIST pidlRoot; /* absolute pidl */ - LPCITEMIDLIST apidl; /* currently focused font item */ + CComPtr<IShellFolder2> m_pisfInner; public: CFontsFolder(); ~CFontsFolder(); Modified: trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp [iso-8859-1] Tue Sep 22 18:11:32 2015 @@ -23,67 +23,38 @@ WINE_DEFAULT_DEBUG_CHANNEL (mydocs); -/* -CFileSysEnumX should not exist. CMyDocsFolder should aggregate a CFSFolder which always -maps the contents of CSIDL_PERSONAL. Therefore, CMyDocsFolder::EnumObjects simply calls -CFSFolder::EnumObjects. -*/ - -/*********************************************************************** -* MyDocumentsfolder implementation -*/ - CMyDocsFolder::CMyDocsFolder() { m_pisfInner = NULL; - m_pisf2Inner = NULL; - pidlRoot = NULL; - sPathTarget = NULL; } CMyDocsFolder::~CMyDocsFolder() { - SHFree(pidlRoot); - if (sPathTarget) - HeapFree(GetProcessHeap(), 0, sPathTarget); m_pisfInner.Release(); - m_pisf2Inner.Release(); } HRESULT WINAPI CMyDocsFolder::FinalConstruct() { - WCHAR szMyPath[MAX_PATH]; - - if (!SHGetSpecialFolderPathW(0, szMyPath, CSIDL_PERSONAL, TRUE)) - return E_UNEXPECTED; - - pidlRoot = _ILCreateMyDocuments(); /* my qualified pidl */ - sPathTarget = (LPWSTR)SHAlloc((wcslen(szMyPath) + 1) * sizeof(WCHAR)); - wcscpy(sPathTarget, szMyPath); - - WCHAR szPath[MAX_PATH]; - lstrcpynW(szPath, sPathTarget, MAX_PATH); - HRESULT hr; CComPtr<IPersistFolder3> ppf3; - hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder, &m_pisfInner)); - if (FAILED(hr)) - return hr; - - hr = m_pisfInner->QueryInterface(IID_PPV_ARG(IShellFolder2, &m_pisf2Inner)); + hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder2, &m_pisfInner)); if (FAILED(hr)) return hr; hr = m_pisfInner->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)); if (FAILED(hr)) return hr; + + LPITEMIDLIST pidlRoot = _ILCreateMyDocuments(); PERSIST_FOLDER_TARGET_INFO info; ZeroMemory(&info, sizeof(PERSIST_FOLDER_TARGET_INFO)); info.csidl = CSIDL_PERSONAL; hr = ppf3->InitializeEx(NULL, pidlRoot, &info); + SHFree(pidlRoot); + return hr; } @@ -125,26 +96,20 @@ SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER | SFGAO_CANRENAME | SFGAO_CANDELETE; if(cidl) - { return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); - } - else - { - if (!rgfInOut) - return E_INVALIDARG; - if (cidl && !apidl) - return E_INVALIDARG; - - if (*rgfInOut == 0) - *rgfInOut = ~0; - - *rgfInOut &= dwMyDocumentsAttributes; - - /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ - *rgfInOut &= ~SFGAO_VALIDATE; - - return S_OK; - } + + if (!rgfInOut || !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + *rgfInOut &= dwMyDocumentsAttributes; + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + return S_OK; } HRESULT WINAPI CMyDocsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, @@ -155,48 +120,25 @@ HRESULT WINAPI CMyDocsFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { + if (!strRet || !pidl) + return E_INVALIDARG; + + /* If we got an fs item just forward to the fs folder */ if (!_ILIsSpecialFolder(pidl)) return m_pisfInner->GetDisplayNameOf(pidl, dwFlags, strRet); - HRESULT hr = S_OK; - LPWSTR pszPath; - - TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet); - pdump (pidl); - - if (!strRet) - return E_INVALIDARG; - - pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); - if (!pszPath) - return E_OUTOFMEMORY; - - ZeroMemory(pszPath, (MAX_PATH + 1) * sizeof(WCHAR)); - - if (_ILIsMyDocuments (pidl) || !pidl->mkid.cb) + /* The caller wants our path. Let fs folder handle it */ + if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && + (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) { - if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && - (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) - wcscpy(pszPath, sPathTarget); - else - HCR_GetClassNameW(CLSID_MyDocuments, pszPath, MAX_PATH); - TRACE("CP\n"); + /* Give an empty pidl to the fs folder to make it tell us its path */ + if (pidl->mkid.cb) + pidl = ILGetNext(pidl); + return m_pisfInner->GetDisplayNameOf(pidl, dwFlags, strRet); } - else - { - hr = E_INVALIDARG; - } - - if (SUCCEEDED(hr)) - { - strRet->uType = STRRET_WSTR; - strRet->pOleStr = pszPath; - } - else - CoTaskMemFree(pszPath); - - TRACE ("-- (%p)->(%s,0x%08x)\n", this, debugstr_w(strRet->pOleStr), hr); - return hr; + + /* Return the display name from the registry */ + return HCR_GetClassName(CLSID_MyDocuments, strRet); } HRESULT WINAPI CMyDocsFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /* simple pidl */ @@ -207,43 +149,41 @@ HRESULT WINAPI CMyDocsFolder::GetDefaultSearchGUID(GUID *pguid) { - return m_pisf2Inner->GetDefaultSearchGUID(pguid); + return m_pisfInner->GetDefaultSearchGUID(pguid); } HRESULT WINAPI CMyDocsFolder::EnumSearches(IEnumExtraSearch ** ppenum) { - return m_pisf2Inner->EnumSearches(ppenum); + return m_pisfInner->EnumSearches(ppenum); } HRESULT WINAPI CMyDocsFolder::GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay) { - return m_pisf2Inner->GetDefaultColumn(dwRes, pSort, pDisplay); + return m_pisfInner->GetDefaultColumn(dwRes, pSort, pDisplay); } HRESULT WINAPI CMyDocsFolder::GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags) { - return m_pisf2Inner->GetDefaultColumnState(iColumn, pcsFlags); + return m_pisfInner->GetDefaultColumnState(iColumn, pcsFlags); } HRESULT WINAPI CMyDocsFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { - return m_pisf2Inner->GetDetailsEx(pidl, pscid, pv); + return m_pisfInner->GetDetailsEx(pidl, pscid, pv); } HRESULT WINAPI CMyDocsFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { - return m_pisf2Inner->GetDetailsOf(pidl, iColumn, psd); + return m_pisfInner->GetDetailsOf(pidl, iColumn, psd); } HRESULT WINAPI CMyDocsFolder::MapColumnToSCID(UINT column, SHCOLUMNID *pscid) { - return m_pisf2Inner->MapColumnToSCID(column, pscid); + return m_pisfInner->MapColumnToSCID(column, pscid); } HRESULT WINAPI CMyDocsFolder::GetClassID(CLSID *lpClassId) { - TRACE ("(%p)\n", this); - if (!lpClassId) return E_POINTER; @@ -254,16 +194,13 @@ HRESULT WINAPI CMyDocsFolder::Initialize(LPCITEMIDLIST pidl) { - TRACE ("(%p)->(%p)\n", this, pidl); - return S_OK; } HRESULT WINAPI CMyDocsFolder::GetCurFolder(LPITEMIDLIST *pidl) { - TRACE ("(%p)->(%p)\n", this, pidl); - - if (!pidl) return E_POINTER; - *pidl = ILClone (pidlRoot); - return S_OK; -} + if (!pidl) + return E_POINTER; + *pidl = _ILCreateMyDocuments(); + return S_OK; +} Modified: trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.h [iso-8859-1] Tue Sep 22 18:11:32 2015 @@ -29,12 +29,7 @@ public IPersistFolder2 { private: - CComPtr<IShellFolder> m_pisfInner; - CComPtr<IShellFolder2> m_pisf2Inner; - - /* both paths are parsible from the MyDocuments */ - LPWSTR sPathTarget; /* complete path to target used for enumeration and ChangeNotify */ - LPITEMIDLIST pidlRoot; /* absolute pidl */ + CComPtr<IShellFolder2> m_pisfInner; public: CMyDocsFolder(); ~CMyDocsFolder(); Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Tue Sep 22 18:11:32 2015 @@ -39,6 +39,9 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut); HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes); + +HRESULT HCR_GetClassName(REFIID riid, LPSTRRET strRet); + HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); HRESULT SHELL32_BindToFS (LPCITEMIDLIST pidlRoot, Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Tue Sep 22 18:11:32 2015 @@ -374,6 +374,17 @@ ILFree (pidlFirst); return hr; +} + +HRESULT HCR_GetClassName(REFIID riid, LPSTRRET strRet) +{ + BOOL bRet; + WCHAR wstrName[MAX_PATH+1]; + bRet = HCR_GetClassNameW(CLSID_MyDocuments, wstrName, MAX_PATH); + if (!bRet) + return E_FAIL; + + return SHSetStrRet(strRet, wstrName); } HRESULT SHELL32_GetDisplayNameOfGUIDItem(IShellFolder2* psf, LPCWSTR pszFolderPath, PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet)

1 0

[pschweitzer] 69318: [KMTESTS:MM] MmAllocatePagesForMdlEx() was added on Windows 2003 SP1. Import it for "older" systems.
by pschweitzer＠svn.reactos.org 22 Sep '15

22 Sep '15

Author: pschweitzer Date: Tue Sep 22 18:05:45 2015 New Revision: 69318 URL: http://svn.reactos.org/svn/reactos?rev=69318&view=rev Log: [KMTESTS:MM] MmAllocatePagesForMdlEx() was added on Windows 2003 SP1. Import it for "older" systems. Modified: trunk/rostests/kmtests/ntos_mm/MmReservedMapping.c Modified: trunk/rostests/kmtests/ntos_mm/MmReservedMapping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmReserve… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmReservedMapping.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmReservedMapping.c [iso-8859-1] Tue Sep 22 18:05:45 2015 @@ -29,6 +29,19 @@ #define MiAddressToPte(x) _MiAddressToPte((PVOID)(x)) #endif + +static +_Must_inspect_result_ +_IRQL_requires_max_ (DISPATCH_LEVEL) +PMDL +(NTAPI +*pMmAllocatePagesForMdlEx)( + _In_ PHYSICAL_ADDRESS LowAddress, + _In_ PHYSICAL_ADDRESS HighAddress, + _In_ PHYSICAL_ADDRESS SkipBytes, + _In_ SIZE_T TotalBytes, + _In_ MEMORY_CACHING_TYPE CacheType, + _In_ ULONG Flags); static BOOLEAN @@ -84,16 +97,21 @@ PPFN_NUMBER MdlPages; ULONG i; + if (skip(pMmAllocatePagesForMdlEx != NULL, "MmAllocatePagesForMdlEx unavailable\n")) + { + return; + } + ZeroPhysical.QuadPart = 0; MaxPhysical.QuadPart = 0xffffffffffffffffLL; /* Create a one-page MDL and map it */ - Mdl = MmAllocatePagesForMdlEx(ZeroPhysical, - MaxPhysical, - ZeroPhysical, - PAGE_SIZE, - MmCached, - 0); + Mdl = pMmAllocatePagesForMdlEx(ZeroPhysical, + MaxPhysical, + ZeroPhysical, + PAGE_SIZE, + MmCached, + 0); if (skip(Mdl != NULL, "No MDL\n")) { return; @@ -153,12 +171,12 @@ MmFreePagesFromMdl(Mdl); /* Map all pages */ - Mdl = MmAllocatePagesForMdlEx(ZeroPhysical, - MaxPhysical, - ZeroPhysical, - TotalPtes * PAGE_SIZE, - MmCached, - 0); + Mdl = pMmAllocatePagesForMdlEx(ZeroPhysical, + MaxPhysical, + ZeroPhysical, + TotalPtes * PAGE_SIZE, + MmCached, + 0); if (skip(Mdl != NULL, "No MDL\n")) { return; @@ -196,12 +214,12 @@ MmFreePagesFromMdl(Mdl); /* Try to map more pages than we reserved */ - Mdl = MmAllocatePagesForMdlEx(ZeroPhysical, - MaxPhysical, - ZeroPhysical, - (TotalPtes + 1) * PAGE_SIZE, - MmCached, - 0); + Mdl = pMmAllocatePagesForMdlEx(ZeroPhysical, + MaxPhysical, + ZeroPhysical, + (TotalPtes + 1) * PAGE_SIZE, + MmCached, + 0); if (skip(Mdl != NULL, "No MDL\n")) { return; @@ -226,6 +244,8 @@ { PVOID Mapping; + pMmAllocatePagesForMdlEx = KmtGetSystemRoutineAddress(L"MmAllocatePagesForMdlEx"); + /* one byte - single page */ Mapping = MmAllocateMappingAddress(1, 'MRmK'); ok(Mapping != NULL, "MmAllocateMappingAddress failed\n");

1 0

[akhaldi] 69317: [CLUSAPI] Order the exports and make sure the list matches our target (Windows Server 2003 Sp2). By Radek Liška, confirmed by me. CORE-8174
by akhaldi＠svn.reactos.org 22 Sep '15

22 Sep '15

Author: akhaldi Date: Tue Sep 22 17:19:14 2015 New Revision: 69317 URL: http://svn.reactos.org/svn/reactos?rev=69317&view=rev Log: [CLUSAPI] Order the exports and make sure the list matches our target (Windows Server 2003 Sp2). By Radek Liška, confirmed by me. CORE-8174 Modified: trunk/reactos/dll/win32/clusapi/clusapi.spec Modified: trunk/reactos/dll/win32/clusapi/clusapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/clusapi/clusapi.spec [iso-8859-1] Tue Sep 22 17:19:14 2015 @@ -1,115 +1,115 @@ -@ stub AddClusterResourceDependency -@ stub AddClusterResourceNode -@ stub BackupClusterDatabase -@ stub CanResourceBeDependent -@ stub ChangeClusterResourceGroup -@ stdcall CloseCluster(ptr) -@ stub CloseClusterGroup -@ stub CloseClusterNetInterface -@ stub CloseClusterNetwork -@ stub CloseClusterNode -@ stub CloseClusterNotifyPort -@ stub CloseClusterResource -@ stdcall ClusterCloseEnum(ptr) -@ stub ClusterControl -@ stdcall ClusterEnum(ptr long ptr ptr ptr) -@ stub ClusterGetEnumCount -@ stub ClusterGroupCloseEnum -@ stub ClusterGroupControl -@ stub ClusterGroupEnum -@ stub ClusterGroupGetEnumCount -@ stub ClusterGroupOpenEnum -@ stub ClusterNetInterfaceControl -@ stub ClusterNetworkCloseEnum -@ stub ClusterNetworkControl -@ stub ClusterNetworkEnum -@ stub ClusterNetworkGetEnumCount -@ stub ClusterNetworkOpenEnum -@ stub ClusterNodeCloseEnum -@ stub ClusterNodeControl -@ stub ClusterNodeEnum -@ stub ClusterNodeGetEnumCount -@ stub ClusterNodeOpenEnum -@ stdcall ClusterOpenEnum(ptr long) -@ stub ClusterRegCloseKey -@ stub ClusterRegCreateKey -@ stub ClusterRegDeleteKey -@ stub ClusterRegDeleteValue -@ stub ClusterRegEnumKey -@ stub ClusterRegEnumValue -@ stub ClusterRegGetKeySecurity -@ stub ClusterRegOpenKey -@ stub ClusterRegQueryInfoKey -@ stub ClusterRegQueryValue -@ stub ClusterRegSetKeySecurity -@ stub ClusterRegSetValue -@ stub ClusterResourceCloseEnum -@ stub ClusterResourceControl -@ stub ClusterResourceEnum -@ stub ClusterResourceGetEnumCount -@ stub ClusterResourceOpenEnum -@ stub ClusterResourceTypeCloseEnum -@ stub ClusterResourceTypeControl -@ stub ClusterResourceTypeEnum -@ stub ClusterResourceTypeGetEnumCount -@ stub ClusterResourceTypeOpenEnum -@ stub CreateClusterGroup -@ stub CreateClusterNotifyPort -@ stub CreateClusterResource -@ stub CreateClusterResourceType -@ stub DeleteClusterGroup -@ stub DeleteClusterResource -@ stub DeleteClusterResourceType -@ stub EvictClusterNode -@ stub EvictClusterNodeEx -@ stub FailClusterResource -@ stub GetClusterFromGroup -@ stub GetClusterFromNetInterface -@ stub GetClusterFromNetwork -@ stub GetClusterFromNode -@ stub GetClusterFromResource -@ stub GetClusterGroupKey -@ stub GetClusterGroupState -@ stdcall GetClusterInformation(ptr ptr ptr ptr) -@ stub GetClusterKey -@ stub GetClusterNetInterface -@ stub GetClusterNetInterfaceKey -@ stub GetClusterNetInterfaceState -@ stub GetClusterNetworkId -@ stub GetClusterNetworkKey -@ stub GetClusterNetworkState -@ stub GetClusterNodeId -@ stub GetClusterNodeKey -@ stub GetClusterNodeState -@ stub GetClusterNotify -@ stub GetClusterQuorumResource -@ stub GetClusterResourceKey -@ stub GetClusterResourceNetworkName -@ stub GetClusterResourceState -@ stub GetClusterResourceTypeKey -@ stdcall GetNodeClusterState(wstr ptr) -@ stub MoveClusterGroup -@ stub OfflineClusterGroup -@ stub OfflineClusterResource -@ stub OnlineClusterGroup -@ stub OnlineClusterResource -@ stdcall OpenCluster(wstr) -@ stub OpenClusterGroup -@ stub OpenClusterNetInterface -@ stub OpenClusterNetwork -@ stub OpenClusterNode -@ stub OpenClusterResource -@ stub PauseClusterNode -@ stub RegisterClusterNotify -@ stub RemoveClusterResourceDependency -@ stub RemoveClusterResourceNode -@ stub RestoreClusterDatabase -@ stub ResumeClusterNode -@ stub SetClusterGroupName -@ stub SetClusterGroupNodeList -@ stub SetClusterName -@ stub SetClusterNetworkName -@ stub SetClusterNetworkPriorityOrder -@ stub SetClusterQuorumResource -@ stub SetClusterResourceName -@ stub SetClusterServiceAccountPassword +1 stub AddClusterResourceDependency +2 stub AddClusterResourceNode +3 stub BackupClusterDatabase +4 stub CanResourceBeDependent +5 stub ChangeClusterResourceGroup +6 stdcall CloseCluster(ptr) +7 stub CloseClusterGroup +8 stub CloseClusterNetInterface +9 stub CloseClusterNetwork +10 stub CloseClusterNode +11 stub CloseClusterNotifyPort +12 stub CloseClusterResource +13 stdcall ClusterCloseEnum(ptr) +14 stub ClusterControl +15 stdcall ClusterEnum(ptr long ptr ptr ptr) +16 stub ClusterGetEnumCount +17 stub ClusterGroupCloseEnum +18 stub ClusterGroupControl +19 stub ClusterGroupEnum +20 stub ClusterGroupGetEnumCount +21 stub ClusterGroupOpenEnum +22 stub ClusterNetInterfaceControl +23 stub ClusterNetworkCloseEnum +24 stub ClusterNetworkControl +25 stub ClusterNetworkEnum +26 stub ClusterNetworkGetEnumCount +27 stub ClusterNetworkOpenEnum +28 stub ClusterNodeCloseEnum +29 stub ClusterNodeControl +30 stub ClusterNodeEnum +31 stub ClusterNodeGetEnumCount +32 stub ClusterNodeOpenEnum +33 stdcall ClusterOpenEnum(ptr long) +34 stub ClusterRegCloseKey +35 stub ClusterRegCreateKey +36 stub ClusterRegDeleteKey +37 stub ClusterRegDeleteValue +38 stub ClusterRegEnumKey +39 stub ClusterRegEnumValue +40 stub ClusterRegGetKeySecurity +41 stub ClusterRegOpenKey +42 stub ClusterRegQueryInfoKey +43 stub ClusterRegQueryValue +44 stub ClusterRegSetKeySecurity +45 stub ClusterRegSetValue +46 stub ClusterResourceCloseEnum +47 stub ClusterResourceControl +48 stub ClusterResourceEnum +49 stub ClusterResourceGetEnumCount +50 stub ClusterResourceOpenEnum +51 stub ClusterResourceTypeCloseEnum +52 stub ClusterResourceTypeControl +53 stub ClusterResourceTypeEnum +54 stub ClusterResourceTypeGetEnumCount +55 stub ClusterResourceTypeOpenEnum +56 stub CreateClusterGroup +57 stub CreateClusterNotifyPort +58 stub CreateClusterResource +59 stub CreateClusterResourceType +60 stub DeleteClusterGroup +61 stub DeleteClusterResource +62 stub DeleteClusterResourceType +63 stub EvictClusterNode +64 stub EvictClusterNodeEx +65 stub FailClusterResource +66 stub GetClusterFromGroup +67 stub GetClusterFromNetInterface +68 stub GetClusterFromNetwork +69 stub GetClusterFromNode +70 stub GetClusterFromResource +71 stub GetClusterGroupKey +72 stub GetClusterGroupState +73 stdcall GetClusterInformation(ptr ptr ptr ptr) +74 stub GetClusterKey +75 stub GetClusterNetInterface +76 stub GetClusterNetInterfaceKey +77 stub GetClusterNetInterfaceState +78 stub GetClusterNetworkId +79 stub GetClusterNetworkKey +80 stub GetClusterNetworkState +81 stub GetClusterNodeId +82 stub GetClusterNodeKey +83 stub GetClusterNodeState +84 stub GetClusterNotify +85 stub GetClusterQuorumResource +86 stub GetClusterResourceKey +87 stub GetClusterResourceNetworkName +88 stub GetClusterResourceState +89 stub GetClusterResourceTypeKey +90 stdcall GetNodeClusterState(wstr ptr) +91 stub MoveClusterGroup +92 stub OfflineClusterGroup +93 stub OfflineClusterResource +94 stub OnlineClusterGroup +95 stub OnlineClusterResource +96 stdcall OpenCluster(wstr) +97 stub OpenClusterGroup +98 stub OpenClusterNetInterface +99 stub OpenClusterNetwork +100 stub OpenClusterNode +101 stub OpenClusterResource +102 stub PauseClusterNode +103 stub RegisterClusterNotify +104 stub RemoveClusterResourceDependency +105 stub RemoveClusterResourceNode +106 stub RestoreClusterDatabase +107 stub ResumeClusterNode +108 stub SetClusterGroupName +109 stub SetClusterGroupNodeList +110 stub SetClusterName +111 stub SetClusterNetworkName +112 stub SetClusterNetworkPriorityOrder +113 stub SetClusterQuorumResource +114 stub SetClusterResourceName +115 stub SetClusterServiceAccountPassword

1 0

[akhaldi] 69316: [CARDS] Order the exports and make sure the list matches our target (Windows Server 2003 Sp2). By Radek Liška, confirmed by me. CORE-8174
by akhaldi＠svn.reactos.org 22 Sep '15

22 Sep '15

Author: akhaldi Date: Tue Sep 22 17:15:37 2015 New Revision: 69316 URL: http://svn.reactos.org/svn/reactos?rev=69316&view=rev Log: [CARDS] Order the exports and make sure the list matches our target (Windows Server 2003 Sp2). By Radek Liška, confirmed by me. CORE-8174 Modified: trunk/reactos/dll/win32/cards/cards.spec Modified: trunk/reactos/dll/win32/cards/cards.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.spec… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.spec [iso-8859-1] Tue Sep 22 17:15:37 2015 @@ -1,6 +1,6 @@ -@ stdcall WEP(long) -@ stdcall cdtAnimate(ptr long long long long) -@ stdcall cdtDraw(ptr long long long long long) -@ stdcall cdtDrawExt(ptr long long long long long long long) -@ stdcall cdtInit(ptr ptr) -@ stdcall cdtTerm() +1 stdcall WEP(long) +2 stdcall cdtAnimate(ptr long long long long) +3 stdcall cdtDraw(ptr long long long long long) +4 stdcall cdtDrawExt(ptr long long long long long long long) +5 stdcall cdtInit(ptr ptr) +6 stdcall cdtTerm()

1 0

[akhaldi] 69315: [BATT] Order the exports and make sure the list matches our target (Windows Server 2003 Sp2). By Radek Liška, confirmed by me. CORE-8174
by akhaldi＠svn.reactos.org 22 Sep '15

22 Sep '15

Author: akhaldi Date: Tue Sep 22 17:08:38 2015 New Revision: 69315 URL: http://svn.reactos.org/svn/reactos?rev=69315&view=rev Log: [BATT] Order the exports and make sure the list matches our target (Windows Server 2003 Sp2). By Radek Liška, confirmed by me. CORE-8174 Modified: trunk/reactos/dll/win32/batt/batt.spec Modified: trunk/reactos/dll/win32/batt/batt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/batt.spec?r… ============================================================================== --- trunk/reactos/dll/win32/batt/batt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/batt/batt.spec [iso-8859-1] Tue Sep 22 17:08:38 2015 @@ -1,3 +1,2 @@ -@ stdcall BatteryClassCoInstaller(long ptr ptr ptr) -@ stdcall BatteryClassInstall(long ptr ptr) - +1 stdcall BatteryClassCoInstaller(long ptr ptr ptr) +2 stdcall BatteryClassInstall(long ptr ptr)

1 0

[akhaldi] 69314: [CPLS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114
by akhaldi＠svn.reactos.org 22 Sep '15

22 Sep '15

Author: akhaldi Date: Tue Sep 22 17:04:32 2015 New Revision: 69314 URL: http://svn.reactos.org/svn/reactos?rev=69314&view=rev Log: [CPLS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/dll/cpl/console/colors.c trunk/reactos/dll/cpl/console/console.c trunk/reactos/dll/cpl/console/font.c trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/cpl/console/options.c trunk/reactos/dll/cpl/hotplug/enum.c trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/advsettings.c trunk/reactos/dll/cpl/input/changekeyseq.c trunk/reactos/dll/cpl/input/input.c trunk/reactos/dll/cpl/input/keysettings.c trunk/reactos/dll/cpl/input/settings.c trunk/reactos/dll/cpl/mmsys/audio.c trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/sounds.c trunk/reactos/dll/cpl/mmsys/voice.c trunk/reactos/dll/cpl/mmsys/volume.c trunk/reactos/dll/cpl/odbccp32/odbccp32.c trunk/reactos/dll/cpl/powercfg/powercfg.c trunk/reactos/dll/cpl/sysdm/licence.c trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/colors.c + * FILE: dll/cpl/console/colors.c * PURPOSE: Colors dialog * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) */ Modified: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/console.c + * FILE: dll/cpl/console/console.c * PURPOSE: Initialization * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: trunk/reactos/dll/cpl/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/font.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/console/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/font.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/font.c + * FILE: dll/cpl/console/font.c * PURPOSE: Font dialog * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/layout.c + * FILE: dll/cpl/console/layout.c * PURPOSE: Layout dialog * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/options.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/options.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/options.c + * FILE: dll/cpl/console/options.c * PURPOSE: Options dialog * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) */ Modified: trunk/reactos/dll/cpl/hotplug/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hotplug/enum.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/hotplug/enum.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hotplug/enum.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * PROJECT: Safely Remove Hardware Applet * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/hotplug/hotplug.c + * FILE: dll/cpl/hotplug/enum.c * PURPOSE: device enumeration * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) */ Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=69… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,6 +1,6 @@ /* * PROJECT: input.dll - * FILE: dll/win32/input/add.c + * FILE: dll/cpl/input/add.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) * Colin Finck Modified: trunk/reactos/dll/cpl/input/advsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/advsettings.… ============================================================================== --- trunk/reactos/dll/cpl/input/advsettings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/advsettings.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,6 +1,6 @@ /* * PROJECT: input.dll - * FILE: dll/win32/input/advsettings.c + * FILE: dll/cpl/input/advsettings.c * PURPOSE: input.dll * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) * Modified: trunk/reactos/dll/cpl/input/changekeyseq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/changekeyseq… ============================================================================== --- trunk/reactos/dll/cpl/input/changekeyseq.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/changekeyseq.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,6 +1,6 @@ /* * PROJECT: input.dll - * FILE: dll/win32/input/changekeyseq.c + * FILE: dll/cpl/input/changekeyseq.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) * UPDATE HISTORY: Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,6 +1,6 @@ /* * PROJECT: input.dll - * FILE: dll/win32/input/input.c + * FILE: dll/cpl/input/input.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * Colin Finck Modified: trunk/reactos/dll/cpl/input/keysettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysettings.… ============================================================================== --- trunk/reactos/dll/cpl/input/keysettings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/keysettings.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,6 +1,6 @@ /* * PROJECT: input.dll - * FILE: dll/win32/input/keysettings.c + * FILE: dll/cpl/input/keysettings.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) * Colin Finck Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,6 +1,6 @@ /* * PROJECT: input.dll - * FILE: dll/win32/input/settings.c + * FILE: dll/cpl/input/settings.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) * Colin Finck Modified: trunk/reactos/dll/cpl/mmsys/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/audio.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * * PROJECT: ReactOS Multimedia Control Panel - * FILE: dll/cpl/mmsys/mmsys.c + * FILE: dll/cpl/mmsys/audio.c * PURPOSE: ReactOS Multimedia Control Panel * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * Johannes Anderwald <janderwald(a)reactos.com> Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * PROJECT: Multimedia Control Panel Applet * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/mmsys/uk-UA.rc + * FILE: dll/cpl/mmsys/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for Multimedia Control Panel Applet * TRANSLATORS: Artem Reznikov, Igor Paliychuk */ Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Multimedia Control Panel - * FILE: dll/cpl/mmsys/mmsys.c + * FILE: dll/cpl/mmsys/sounds.c * PURPOSE: ReactOS Multimedia Control Panel * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * Johannes Anderwald <janderwald(a)reactos.com> Modified: trunk/reactos/dll/cpl/mmsys/voice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/voice.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/voice.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/voice.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * * PROJECT: ReactOS Multimedia Control Panel - * FILE: dll/cpl/mmsys/mmsys.c + * FILE: dll/cpl/mmsys/voice.c * PURPOSE: ReactOS Multimedia Control Panel * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * Johannes Anderwald <janderwald(a)reactos.com> Modified: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Multimedia Control Panel - * FILE: dll/cpl/mmsys/mmsys.c + * FILE: dll/cpl/mmsys/volume.c * PURPOSE: ReactOS Multimedia Control Panel * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * Johannes Anderwald <janderwald(a)reactos.com> Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS ODBC Control Panel Applet - * FILE: dll/cpl/main/main.c + * FILE: dll/cpl/odbccp32/odbccp32.c * PURPOSE: applet initialization * PROGRAMMER: Johannes Anderwald */ Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Power Configuration Applet * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/powercfg/powershemes.c + * FILE: dll/cpl/powercfg/powercfg.c * PURPOSE: initialization of applet * PROGRAMMERS: Alexander Wurzinger (Lohnegrim at gmx dot net) * Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/cpl/sysdm/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/licence.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/licence.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/licence.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS System Control Panel Applet * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/sysdm/general.c + * FILE: dll/cpl/sysdm/licence.c * PURPOSE: Licence dialog box message handler * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> * Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] Tue Sep 22 17:04:32 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS system properties, control panel applet * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/sysdm/virtual.c + * FILE: dll/cpl/sysdm/virtmem.c * PURPOSE: Virtual memory control dialog * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> *

1 0

[jimtabor] 69313: [RosApps|WineFile] Patch by Jared Smudde - Sync wine File with wine. See ROSAPPS-302.
by jimtabor＠svn.reactos.org 22 Sep '15

22 Sep '15

Author: jimtabor Date: Tue Sep 22 00:40:19 2015 New Revision: 69313 URL: http://svn.reactos.org/svn/reactos?rev=69313&view=rev Log: [RosApps|WineFile] Patch by Jared Smudde - Sync wine File with wine. See ROSAPPS-302. Modified: trunk/rosapps/applications/winfile/splitpath.c trunk/rosapps/applications/winfile/winefile.c Modified: trunk/rosapps/applications/winfile/splitpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/split… ============================================================================== --- trunk/rosapps/applications/winfile/splitpath.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/splitpath.c [iso-8859-1] Tue Sep 22 00:40:19 2015 @@ -35,9 +35,8 @@ } else if (drv) *drv = '\0'; - /* search for end of string or stream separator */ - for(end=path; *end && *end!=':'; ) - end++; + /* Don't parse colons as stream separators when splitting paths */ + end = path + lstrlenW(path); /* search for begin of file extension */ for(p=end; p>path && *--p!='\\' && *p!='/'; ) Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Tue Sep 22 00:40:19 2015 @@ -1323,9 +1323,17 @@ if (path) { - lstrcpyW(child->path, path); - - _wsplitpath(path, drv, dir, name, ext); + int pathlen = strlenW(path); + const WCHAR *npath = path; + + if (path[0] == '"' && path[pathlen - 1] == '"') + { + npath++; + pathlen--; + } + lstrcpynW(child->path, npath, pathlen + 1); + + _wsplitpath(child->path, drv, dir, name, ext); } lstrcpyW(child->filter_pattern, sAsterics); @@ -1757,11 +1765,11 @@ static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCWSTR strFilename) { - static WCHAR sBackSlash[] = {'\\','\0'}; - static WCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n','\0'}; - static WCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', + static const WCHAR sBackSlash[] = {'\\','\0'}; + static const WCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n','\0'}; + static const WCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; - static WCHAR sFmt[] = {'%','d','.','%','d','.','%','d','.','%','d','\0'}; + static const WCHAR sFmt[] = {'%','d','.','%','d','.','%','d','.','%','d','\0'}; DWORD dwVersionDataLen = GetFileVersionInfoSizeW(strFilename, NULL); if (dwVersionDataLen) {

1 0

[jimtabor] 69312: [Win32SS] - Fix MDI menu redraw. Tested with WineFile.
by jimtabor＠svn.reactos.org 22 Sep '15

22 Sep '15

Author: jimtabor Date: Tue Sep 22 00:38:48 2015 New Revision: 69312 URL: http://svn.reactos.org/svn/reactos?rev=69312&view=rev Log: [Win32SS] - Fix MDI menu redraw. Tested with WineFile. Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/user32/windows/defwnd.c trunk/reactos/win32ss/user/user32/windows/mdi.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Tue Sep 22 00:38:48 2015 @@ -988,6 +988,15 @@ if (!(Style & WS_MINIMIZE)) { + PMENU menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu)); + /* Draw menu bar */ + if (menu && !(Style & WS_CHILD)) + { + TempRect = CurrentRect; + TempRect.bottom = TempRect.top + menu->cyMenu; + CurrentRect.top += MENU_DrawMenuBar(hDC, &TempRect, pWnd, FALSE); + } + if (ExStyle & WS_EX_CLIENTEDGE) { DrawEdge(hDC, &CurrentRect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); @@ -1014,7 +1023,6 @@ PWND Parent; RECT WindowRect, CurrentRect, TempRect; BOOL Active = FALSE; - PCURICON_OBJECT pIcon = NULL; if (!IntIsWindowVisible(pWnd) || (pWnd->state & WNDS_NONCPAINT && !(pWnd->state & WNDS_FORCEMENUDRAW)) || @@ -1118,7 +1126,7 @@ CurrentRect.top += UserGetSystemMetrics(SM_CYCAPTION); } - UserDrawCaption(pWnd, hDC, &TempRect, NULL, pIcon ? UserHMGetHandle(pIcon) : NULL, NULL, Flags); + UserDrawCaption(pWnd, hDC, &TempRect, NULL, NULL, NULL, Flags); /* Draw buttons */ if (Style & WS_SYSMENU) Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Tue Sep 22 00:38:48 2015 @@ -380,6 +380,13 @@ switch(Routine) { + case TWOPARAM_ROUTINE_REDRAWTITLE: + { + DWORD_PTR Ret; + Window = UserGetWindowObject((HWND)Param1); + Ret = (DWORD_PTR)UserPaintCaption(Window, (INT)Param2); + RETURN(Ret); + } case TWOPARAM_ROUTINE_SETMENUBARHEIGHT: { DWORD_PTR Ret; Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Tue Sep 22 00:38:48 2015 @@ -382,6 +382,7 @@ ReleaseDC(UserHMGetHandle(pwnd), hDC); } } + //NtUserCallTwoParam((DWORD_PTR)UserHMGetHandle(pwnd),Flags,TWOPARAM_ROUTINE_REDRAWTITLE) } LRESULT FASTCALL Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] Tue Sep 22 00:38:48 2015 @@ -1092,8 +1092,11 @@ DefWindowProcW( frame, WM_SETTEXT, 0, (LPARAM)lpBuffer ); if (repaint) + { + if (!NtUserCallTwoParam((DWORD_PTR)frame,DC_ACTIVE,TWOPARAM_ROUTINE_REDRAWTITLE)) SetWindowPos( frame, 0,0,0,0,0, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER ); + } }

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