Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[cwittich] 66427: [PSDK] add missing member bFullscreenSupported to _CONSOLE_SCREEN_BUFFER_INFOEX
by cwittich＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: cwittich Date: Mon Feb 23 17:31:27 2015 New Revision: 66427 URL: http://svn.reactos.org/svn/reactos?rev=66427&view=rev Log: [PSDK] add missing member bFullscreenSupported to _CONSOLE_SCREEN_BUFFER_INFOEX Modified: trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Mon Feb 23 17:31:27 2015 @@ -284,6 +284,7 @@ SMALL_RECT srWindow; COORD dwMaximumWindowSize; WORD wPopupAttributes; + BOOL bFullscreenSupported; COLORREF ColorTable[16]; } CONSOLE_SCREEN_BUFFER_INFOEX, *PCONSOLE_SCREEN_BUFFER_INFOEX;

1 0

[dquintana] 66426: [NTOBJSHEX] * Fix all the size calculations broken by r66425. * Fix subfolder navigation (in windows). * Fix enumeration skipping the last item. * Add the beginning of a registry...
by dquintana＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: dquintana Date: Mon Feb 23 17:13:32 2015 New Revision: 66426 URL: http://svn.reactos.org/svn/reactos?rev=66426&view=rev Log: [NTOBJSHEX] * Fix all the size calculations broken by r66425. * Fix subfolder navigation (in windows). * Fix enumeration skipping the last item. * Add the beginning of a registry folder implementation. It doesn't display all data types yet, and it doesn't support editing or searching. CORE-9244 Added: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp (with props) trunk/reactos/dll/shellext/ntobjshex/regfolder.h (with props) trunk/reactos/dll/shellext/ntobjshex/util.h (with props) Modified: trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h trunk/reactos/dll/shellext/ntobjshex/precomp.h trunk/reactos/dll/shellext/ntobjshex/resource.h Modified: trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/CMa… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt [iso-8859-1] Mon Feb 23 17:13:32 2015 @@ -19,6 +19,7 @@ ntobjshex.cpp ntobjutil.cpp ntobjshex.rc + regfolder.cpp ${CMAKE_CURRENT_BINARY_DIR}/ntobjshex.def) list(APPEND atl_rc_deps Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] Mon Feb 23 17:13:32 2015 @@ -9,6 +9,7 @@ #include "precomp.h" #include "ntobjutil.h" #include <ntquery.h> +#include "util.h" #define SHCIDS_ALLFIELDS 0x80000000L #define SHCIDS_CANONICALONLY 0x10000000L @@ -32,45 +33,6 @@ NTOBJECT_COLUMN_LINKTARGET = 3, }; -static HRESULT MakeStrRetFromString(LPCWSTR string, DWORD cbLength, STRRET * str) -{ - str->uType = STRRET_WSTR; - - DWORD blen = cbLength + sizeof(WCHAR); - str->pOleStr = (LPWSTR) CoTaskMemAlloc(blen); - return StringCbCopyNW(str->pOleStr, blen, string, cbLength); -} - -static HRESULT MakeStrRetFromString(LPCWSTR string, STRRET * str) -{ - DWORD stringLength = wcslen(string) * sizeof(WCHAR); - return MakeStrRetFromString(string, stringLength, str); -} - -static HRESULT MakeVariantString(VARIANT * pv, PCWSTR string) -{ - V_VT(pv) = VT_BSTR; - V_BSTR(pv) = SysAllocString(string); - return S_OK; -} - -static HRESULT GetFullName(PCIDLIST_ABSOLUTE pidl, DWORD uFlags, PWSTR strName, DWORD cchName) -{ - CComPtr<IShellFolder> psfDesktop; - STRRET str; - HRESULT hr; - - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = psfDesktop->GetDisplayNameOf(pidl, uFlags, &str); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return StrRetToBufW(&str, pidl, strName, cchName); -} - class CNtObjectFolderContextMenu : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IContextMenu @@ -113,7 +75,8 @@ const NtPidlEntry * entry = (NtPidlEntry *) m_pcidlChild; if ((entry->objectType == DIRECTORY_OBJECT) || - (entry->objectType == SYMBOLICLINK_OBJECT)) + (entry->objectType == SYMBOLICLINK_OBJECT) || + (entry->objectType == KEY_OBJECT)) { MENUITEMINFOW mii; @@ -373,6 +336,13 @@ return E_FAIL; } + NtPidlEntry * info = (NtPidlEntry *) pcidl; + if ((info->cb < sizeof(NtPidlEntry)) || (info->magic != NT_OBJECT_PIDL_MAGIC)) + { + ERR("FindPidlInList: Requested pidl is not of the correct type.\n"); + return E_INVALIDARG; + } + TRACE("Searching for pidl { cb=%d } in a list of %d items\n", pcidl->mkid.cb, m_hDpaCount); for (UINT i = 0; i < m_hDpaCount; i++) @@ -395,7 +365,7 @@ } } - TRACE("Pidl not found\n"); + ERR("PIDL NOT FOUND: Requested filename: %S\n", info->entryName); return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } @@ -537,6 +507,9 @@ if (entry->objectType == SYMBOLICLINK_OBJECT) flags |= SFGAO_LINK | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE; + if (entry->objectType == KEY_OBJECT) + flags |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE; + return flags & mask; } @@ -605,6 +578,7 @@ { case SYMBOLICLINK_OBJECT: case DIRECTORY_OBJECT: + case KEY_OBJECT: flagsOk = (m_Flags & SHCONTF_FOLDERS) != 0; break; default: @@ -613,7 +587,7 @@ } } while (m_Index < m_Count && !flagsOk); - if (m_Index < m_Count) + if (flagsOk) { if (rgelt) rgelt[i] = m_Folder->GetManager().CreatePidlFromItem(tinfo); @@ -660,12 +634,6 @@ //----------------------------------------------------------------------------- // CNtObjectFolder -extern "C" -HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv) -{ - return ShellObjectCreator<CNtObjectFolder>(riid, ppv); -} - CNtObjectFolder::CNtObjectFolder() : m_PidlManager(NULL), m_shellPidl(NULL) @@ -674,6 +642,7 @@ CNtObjectFolder::~CNtObjectFolder() { + TRACE("Destroying CNtObjectFolder %p\n", this); } // IShellFolder @@ -697,7 +666,7 @@ if (pdwAttributes) *pdwAttributes = 0; - TRACE("ParseDisplayName name=%S\n", lpszDisplayName); + TRACE("CNtObjectFolder::ParseDisplayName name=%S (ntPath=%S)\n", lpszDisplayName, m_NtPath); hr = m_PidlManager->FindByName(lpszDisplayName, &info); if (FAILED(hr)) @@ -743,36 +712,64 @@ return E_ACCESSDENIED; WCHAR path[MAX_PATH]; + StringCbCopyW(path, _countof(path), m_NtPath); + PathAppendW(path, info->entryName); + + LPITEMIDLIST first = ILCloneFirst(pidl); + LPCITEMIDLIST rest = ILGetNext(pidl); + + LPITEMIDLIST fullPidl = ILCombine(m_shellPidl, first); if (info->objectType == SYMBOLICLINK_OBJECT) { - NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + sizeof(NtPidlEntry) + info->entryNameLength + sizeof(WCHAR)); + NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); if (symlink->targetNameLength > 0) { - StringCbCopyW(path, _countof(path), symlink->targetName); + if (symlink->targetName[1] == L':' && isalphaW(symlink->targetName[0])) + { + ERR("TODO: Navigating to WIN32 PATH from NT PATH.\n"); + return E_NOTIMPL; + } + + StringCbCopyW(path, _countof(path), L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"); + PathAppend(path, symlink->targetName); + + CComPtr<IShellFolder> psfDesktop; + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = psfDesktop->ParseDisplayName(NULL, NULL, path, NULL, &first, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; } else { return E_UNEXPECTED; } } + + CComPtr<IShellFolder> psfChild; + + if (info->objectType == KEY_OBJECT) + { + hr = ShellObjectCreatorInit<CRegistryFolder>(fullPidl, path, IID_PPV_ARG(IShellFolder, &psfChild)); + } else { - StringCbCopyW(path, _countof(path), m_NtPath); - - PathAppendW(path, info->entryName); - - DbgPrint("BindToObject for Directory %S\n", path); - } - - LPITEMIDLIST fullPidl = ILCombine(m_shellPidl, pidl); - - hr = ShellObjectCreatorInit<CNtObjectFolder>(fullPidl, path, riid, ppvOut); + hr = ShellObjectCreatorInit<CNtObjectFolder>(fullPidl, path, IID_PPV_ARG(IShellFolder, &psfChild)); + } ILFree(fullPidl); - - return hr; + ILFree(first); + + if (rest->mkid.cb > 0) + { + return psfChild->BindToObject(rest, pbcReserved, riid, ppvOut); + } + + return psfChild->QueryInterface(riid, ppvOut); } return E_NOTIMPL; @@ -953,18 +950,70 @@ // IPersistFolder HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl) { - return Initialize(pidl, L"\\"); + m_shellPidl = ILClone(pidl); + + PCWSTR ntPath = L"\\"; + +#if 0 + WCHAR debugTemp[MAX_PATH]; + GetFullName(m_shellPidl, SHGDN_FORPARSING, debugTemp, _countof(debugTemp)); + DbgPrint("INITIALIZE CRegistryFolder PIDL PATH: %S (ntPath: %S)\n", debugTemp, ntPath); + + if (ntPath[wcslen(ntPath)-1] == L'\\' && debugTemp[wcslen(debugTemp) - 1] != L'\\') + wcscat(debugTemp, L"\\"); + + PCWSTR guidTemp = L"::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"; + + PCWSTR findTemp = StrStrW(debugTemp, guidTemp); + PCWSTR nextTemp = findTemp + wcslen(guidTemp); + + if (wcscmp(nextTemp, ntPath)) + { + DbgPrint("WHAT THE F, the NT PATH DOES NOT MATCH\n"); + return E_FAIL; + } +#endif + + if (!m_PidlManager) + { + m_PidlManager = new CNtObjectPidlManager(); + + StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); + } + + return m_PidlManager->Initialize(m_NtPath); } // Internal HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath) { + TRACE("INITIALIZE %p CNtObjectFolder with ntPath %S\n", this, ntPath); + +#if 0 m_shellPidl = ILClone(pidl); - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); - + WCHAR debugTemp[MAX_PATH]; + GetFullName(m_shellPidl, SHGDN_FORPARSING, debugTemp, _countof(debugTemp)); + DbgPrint("INITIALIZE CNtObjectFolder PIDL PATH: %S (ntPath: %S)\n", debugTemp, ntPath); + + if (ntPath[wcslen(ntPath) - 1] == L'\\' && debugTemp[wcslen(debugTemp) - 1] != L'\\') + wcscat(debugTemp, L"\\"); + + PCWSTR guidTemp = L"::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"; + + PCWSTR findTemp = StrStrW(debugTemp, guidTemp); + PCWSTR nextTemp = findTemp + wcslen(guidTemp); + + if (wcscmp(nextTemp, ntPath)) + { + DbgPrint("WHAT THE F, the NT PATH DOES NOT MATCH\n"); + return E_FAIL; + } +#endif + if (!m_PidlManager) m_PidlManager = new CNtObjectPidlManager(); + StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); return m_PidlManager->Initialize(m_NtPath); } @@ -1055,7 +1104,7 @@ { if (info->objectType < 0) { - NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + sizeof(NtPidlEntry) + info->entryNameLength + sizeof(WCHAR)); + NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); if (td->typeNameLength > 0) { @@ -1089,7 +1138,7 @@ { if (info->objectType == SYMBOLICLINK_OBJECT) { - NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + sizeof(NtPidlEntry) + info->entryNameLength + sizeof(WCHAR)); + NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); if (symlink->targetNameLength > 0) { @@ -1134,7 +1183,7 @@ if (info->objectType < 0) { - NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + sizeof(NtPidlEntry) + info->entryNameLength + sizeof(WCHAR)); + NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); if (td->typeNameLength > 0) MakeStrRetFromString(td->typeName, td->typeNameLength, &(psd->str)); @@ -1170,7 +1219,7 @@ if (info->objectType == SYMBOLICLINK_OBJECT) { - NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + sizeof(NtPidlEntry) + info->entryNameLength + sizeof(WCHAR)); + NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); if (symlink->targetNameLength > 0) { Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp [iso-8859-1] Mon Feb 23 17:13:32 2015 @@ -36,7 +36,22 @@ 0 }; -static DWORD NtOpenObject(OBJECT_TYPE type, HANDLE* phandle, DWORD access, LPCWSTR path) +const LPCWSTR RegistryTypeNames[] = { + L"REG_NONE", + L"REG_SZ", + L"REG_EXPAND_SZ", + L"REG_BINARY", + L"REG_DWORD", + L"REG_DWORD_BIG_ENDIAN", + L"REG_LINK", + L"REG_MULTI_SZ", + L"REG_RESOURCE_LIST", + L"REG_FULL_RESOURCE_DESCRIPTOR", + L"REG_RESOURCE_REQUIREMENTS_LIST ", + L"REG_QWORD" +}; + +static DWORD NtOpenObject(OBJECT_TYPE type, PHANDLE phandle, DWORD access, LPCWSTR path) { UNICODE_STRING ustr; @@ -128,7 +143,7 @@ UNICODE_STRING link; RtlInitEmptyUnicodeString(&link, wbLink, sizeof(wbLink)); - DWORD entryBufferLength = sizeof(NtPidlEntry) + sizeof(WCHAR); + DWORD entryBufferLength = FIELD_OFFSET(NtPidlEntry,entryName) + sizeof(WCHAR); if (info->Name.Buffer) entryBufferLength += info->Name.Length; @@ -183,7 +198,7 @@ memset(entry, 0, entryBufferLength); - entry->cb = sizeof(NtPidlEntry); + entry->cb = FIELD_OFFSET(NtPidlEntry,entryName); entry->magic = NT_OBJECT_PIDL_MAGIC; entry->objectType = otype; entry->objectInformation = object; @@ -242,3 +257,161 @@ return S_OK; } + +HRESULT EnumerateRegistryKey(HDPA hdpa, PCWSTR path, HKEY root, UINT * hdpaCount) +{ + *hdpaCount = 0; + + HKEY hkey; + + DWORD res; + if (root) + { + res = RegOpenKeyExW(root, *path == '\\' ? path + 1 : path, 0, STANDARD_RIGHTS_READ | KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hkey); + } + else + { + res = NtOpenObject(KEY_OBJECT, (PHANDLE)&hkey, STANDARD_RIGHTS_READ | KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, path); + } + if (!NT_SUCCESS(res)) + { + ERR("RegOpenKeyExW failed for path %S with status=%x\n", path, res); + return HRESULT_FROM_NT(res); + } + + for (int idx = 0;; ++idx) + { + WCHAR name[MAX_PATH]; + DWORD cchName = _countof(name); + + WCHAR className[MAX_PATH]; + DWORD cchClass = _countof(className); + + if (RegEnumKeyExW(hkey, idx, name, &cchName, 0, className, &cchClass, NULL)) + break; + + name[cchName] = 0; + className[cchClass] = 0; + + REG_ENTRY_TYPE otype = REG_ENTRY_KEY; + + DWORD entryBufferLength = FIELD_OFFSET(RegPidlEntry,entryName) + sizeof(WCHAR) + cchName * sizeof(WCHAR); + + if (cchClass > 0) + { + entryBufferLength += sizeof(WCHAR) + cchClass * sizeof(WCHAR); + } + + RegPidlEntry* entry = (RegPidlEntry*) CoTaskMemAlloc(entryBufferLength); + if (!entry) + return E_OUTOFMEMORY; + + memset(entry, 0, entryBufferLength); + + entry->cb = FIELD_OFFSET(NtPidlEntry,entryName); + entry->magic = REGISTRY_PIDL_MAGIC; + entry->entryType = otype; + + if (cchName > 0) + { + entry->entryNameLength = cchName * sizeof(WCHAR); + StringCbCopyNW(entry->entryName, entryBufferLength, name, entry->entryNameLength); + entry->cb += entry->entryNameLength + sizeof(WCHAR); + } + else + { + entry->entryNameLength = 0; + entry->entryName[0] = 0; + entry->cb += sizeof(WCHAR); + } + + if (cchClass) + { + PWSTR contentData = (PWSTR) ((PBYTE) entry + entry->cb); + DWORD remainingSpace = entryBufferLength - entry->cb; + + entry->contentsLength = cchClass * sizeof(WCHAR); + StringCbCopyNW(contentData, remainingSpace, className, entry->contentsLength); + + entry->cb += entry->contentsLength + sizeof(WCHAR); + } + + DPA_AppendPtr(hdpa, entry); + (*hdpaCount)++; + + } + + for (int idx = 0;; ++idx) + { + WCHAR name[MAX_PATH]; + DWORD cchName = _countof(name); + DWORD type; + DWORD dataSize; + + if (RegEnumValueW(hkey, idx, name, &cchName, 0, &type, NULL, &dataSize)) + break; + + REG_ENTRY_TYPE otype = REG_ENTRY_VALUE; + + DWORD entryBufferLength = FIELD_OFFSET(RegPidlEntry,entryName) + sizeof(WCHAR) + cchName * sizeof(WCHAR); + + BOOL copyData = dataSize < 32; + if (copyData) + { + entryBufferLength += dataSize + sizeof(WCHAR); + + otype = REG_ENTRY_VALUE_WITH_CONTENT; + } + + RegPidlEntry* entry = (RegPidlEntry*) CoTaskMemAlloc(entryBufferLength); + if (!entry) + return E_OUTOFMEMORY; + + memset(entry, 0, entryBufferLength); + + entry->cb = FIELD_OFFSET(RegPidlEntry, entryName); + entry->magic = REGISTRY_PIDL_MAGIC; + entry->entryType = otype; + + if (cchName > 0) + { + entry->entryNameLength = cchName * sizeof(WCHAR); + StringCbCopyNW(entry->entryName, entryBufferLength, name, entry->entryNameLength); + entry->cb += entry->entryNameLength + sizeof(WCHAR); + } + else + { + entry->entryNameLength = 0; + entry->entryName[0] = 0; + entry->cb += sizeof(WCHAR); + } + + if (copyData) + { + PBYTE contentData = (PBYTE) ((PBYTE) entry + entry->cb); + + entry->contentsLength = dataSize; + + // In case it's an unterminated string, RegGetValue will add the NULL termination + dataSize += sizeof(WCHAR); + + if (!RegQueryValueExW(hkey, name, NULL, NULL, contentData, &dataSize)) + { + entry->cb += entry->contentsLength + sizeof(WCHAR); + } + else + { + entry->contentsLength = 0; + entry->cb += sizeof(WCHAR); + } + + } + + DPA_AppendPtr(hdpa, entry); + (*hdpaCount)++; + } + + RegCloseKey(hkey); + + return S_OK; +} Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] Mon Feb 23 17:13:32 2015 @@ -37,8 +37,11 @@ extern const LPCWSTR ObjectTypeNames[]; #define NT_OBJECT_PIDL_MAGIC (USHORT)0x9A03 +#define REGISTRY_PIDL_MAGIC (USHORT)0x5364 #include <pshpack1.h> + +// NT OBJECT browsere struct NtPidlEntry { USHORT cb; @@ -65,6 +68,37 @@ USHORT targetNameLength; WCHAR targetName[ANYSIZE_ARRAY]; }; + +// REGISTRY browsere +enum REG_ENTRY_TYPE +{ + REG_ENTRY_KEY, + REG_ENTRY_VALUE, + REG_ENTRY_VALUE_WITH_CONTENT + // any more? +}; +extern const LPCWSTR RegistryTypeNames []; + +struct RegPidlEntry +{ + USHORT cb; + USHORT magic; // 0x5364 ~~~ "REGK" + + REG_ENTRY_TYPE entryType; + + USHORT entryNameLength; + + // For Value entries, this contains the value contents, if it's resonably small. + // For Key entries, this contains the custom class name + DWORD contentType; + USHORT contentsLength; + + WCHAR entryName[0]; + +}; + + #include <poppack.h> -HRESULT EnumerateNtDirectory(HDPA hdpa, PCWSTR path, UINT * hdpaCount); +HRESULT EnumerateNtDirectory(HDPA hdpa, PCWSTR path, UINT * hdpaCount); +HRESULT EnumerateRegistryKey(HDPA hdpa, PCWSTR path, HKEY root, UINT * hdpaCount); Modified: trunk/reactos/dll/shellext/ntobjshex/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/pre… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/precomp.h [iso-8859-1] Mon Feb 23 17:13:32 2015 @@ -47,3 +47,4 @@ 0x845b0fb2, 0x66e0, 0x416b, 0x8f, 0x91, 0x31, 0x4e, 0x23, 0xf7, 0xc1, 0x2d); #include "ntobjns.h" +#include "regfolder.h" Added: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp (added) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Mon Feb 23 17:13:32 2015 @@ -0,0 +1,1248 @@ +/* +* PROJECT: ReactOS shell extensions +* LICENSE: GPL - See COPYING in the top level directory +* FILE: dll\shellext\ntobjshex\ntobjns.cpp +* PURPOSE: NT Object Namespace shell extension +* PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> +*/ + +#include "precomp.h" +#include "ntobjutil.h" +#include <ntquery.h> +#include "util.h" + +#define SHCIDS_ALLFIELDS 0x80000000L +#define SHCIDS_CANONICALONLY 0x10000000L + +#define GET_SHGDN_FOR(dwFlags) ((DWORD)dwFlags & (DWORD)0x0000FF00) +#define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF) + +WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); + +// {1C6D6E08-2332-4A7B-A94D-6432DB2B5AE6} +const GUID CLSID_RegistryFolder = { 0x1c6d6e08, 0x2332, 0x4a7b, { 0xa9, 0x4d, 0x64, 0x32, 0xdb, 0x2b, 0x5a, 0xe6 } }; + +// {18A4B504-F6D8-4D8A-8661-6296514C2CF0} +static const GUID GUID_RegistryColumns = { 0x18a4b504, 0xf6d8, 0x4d8a, { 0x86, 0x61, 0x62, 0x96, 0x51, 0x4c, 0x2c, 0xf0 } }; + +enum RegistryColumns +{ + REGISTRY_COLUMN_NAME = 0, + REGISTRY_COLUMN_TYPE = 1, + REGISTRY_COLUMN_VALUE = 2, +}; + +class CRegistryFolderContextMenu : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IContextMenu +{ + PCIDLIST_ABSOLUTE m_pcidlFolder; + PCITEMID_CHILD m_pcidlChild; + UINT m_idFirst; + +public: + CRegistryFolderContextMenu() : + m_pcidlFolder(NULL), + m_pcidlChild(NULL), + m_idFirst(0) + { + + } + + virtual ~CRegistryFolderContextMenu() + { + if (m_pcidlFolder) + ILFree((LPITEMIDLIST) m_pcidlFolder); + if (m_pcidlChild) + ILFree((LPITEMIDLIST) m_pcidlChild); + } + + HRESULT Initialize(PCIDLIST_ABSOLUTE parent, UINT cidl, PCUITEMID_CHILD_ARRAY apidl) + { + m_pcidlFolder = ILClone(parent); + if (cidl != 1) + return E_INVALIDARG; + m_pcidlChild = ILClone(apidl[0]); + return S_OK; + } + + // IContextMenu + virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) + { + m_idFirst = idCmdFirst; + + const RegPidlEntry * entry = (RegPidlEntry *) m_pcidlChild; + + if (entry->entryType == REG_ENTRY_KEY) + { + MENUITEMINFOW mii; + + WCHAR open [] = L"Open"; + WCHAR opennewwindow [] = L"Open in new window"; + + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; + mii.fType = MFT_STRING; + mii.wID = idCmdFirst++; + mii.dwTypeData = open; + mii.cch = _countof(open); + mii.fState = MFS_ENABLED | MFS_DEFAULT; + mii.hSubMenu = NULL; + InsertMenuItemW(hmenu, idCmdFirst, TRUE, &mii); + + if (!(uFlags & CMF_DEFAULTONLY) && idCmdFirst <= idCmdLast) + { + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; + mii.fType = MFT_STRING; + mii.wID = idCmdFirst++; + mii.dwTypeData = opennewwindow; + mii.cch = _countof(opennewwindow); + mii.fState = MFS_ENABLED; + mii.hSubMenu = NULL; + InsertMenuItemW(hmenu, idCmdFirst, FALSE, &mii); + } + } + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst - m_idFirst); + } + + virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici) + { + if (LOWORD(lpici->lpVerb) == m_idFirst || !lpici->lpVerb) + { + LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild); + + SHELLEXECUTEINFO sei = { 0 }; + sei.cbSize = sizeof(sei); + sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; + sei.lpIDList = fullPidl; + sei.lpClass = L"folder"; + sei.hwnd = lpici->hwnd; + sei.nShow = lpici->nShow; + sei.lpVerb = L"open"; + BOOL bRes = ::ShellExecuteEx(&sei); + + ILFree(fullPidl); + + return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError()); + } + else if (LOWORD(lpici->lpVerb) == (m_idFirst + 1)) + { + LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild); + + SHELLEXECUTEINFO sei = { 0 }; + sei.cbSize = sizeof(sei); + sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; + sei.lpIDList = fullPidl; + sei.lpClass = L"folder"; + sei.hwnd = lpici->hwnd; + sei.nShow = lpici->nShow; + sei.lpVerb = L"opennewwindow"; + BOOL bRes = ::ShellExecuteEx(&sei); + + ILFree(fullPidl); + + return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError()); + } + return E_NOTIMPL; + } + + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax) + { + if (idCmd == m_idFirst) + { + if (uType == GCS_VERBW) + { + return StringCchCopyW((LPWSTR) pszName, cchMax, L"open"); + } + } + else if (idCmd == (m_idFirst + 1)) + { + if (uType == GCS_VERBW) + { + return StringCchCopyW((LPWSTR) pszName, cchMax, L"opennewwindow"); + } + } + return E_NOTIMPL; + } + + DECLARE_NOT_AGGREGATABLE(CRegistryFolderContextMenu) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CRegistryFolderContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + END_COM_MAP() + +}; + +class CRegistryFolderExtractIcon : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IExtractIconW +{ + PCIDLIST_ABSOLUTE m_pcidlFolder; + PCITEMID_CHILD m_pcidlChild; + +public: + CRegistryFolderExtractIcon() : + m_pcidlFolder(NULL), + m_pcidlChild(NULL) + { + + } + + virtual ~CRegistryFolderExtractIcon() + { + if (m_pcidlFolder) + ILFree((LPITEMIDLIST) m_pcidlFolder); + if (m_pcidlChild) + ILFree((LPITEMIDLIST) m_pcidlChild); + } + + HRESULT Initialize(PCIDLIST_ABSOLUTE parent, UINT cidl, PCUITEMID_CHILD_ARRAY apidl) + { + m_pcidlFolder = ILClone(parent); + if (cidl != 1) + return E_INVALIDARG; + m_pcidlChild = ILClone(apidl[0]); + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE GetIconLocation( + UINT uFlags, + LPWSTR szIconFile, + UINT cchMax, + INT *piIndex, + UINT *pwFlags) + { + const RegPidlEntry * entry = (RegPidlEntry *) m_pcidlChild; + + if ((entry->cb < sizeof(RegPidlEntry)) || (entry->magic != REGISTRY_PIDL_MAGIC)) + return E_INVALIDARG; + + UINT flags = 0; + + switch (entry->entryType) + { + case REG_ENTRY_KEY: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_REGISTRYKEY; + *pwFlags = flags; + return S_OK; + case REG_ENTRY_VALUE: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_REGISTRYVALUE; + *pwFlags = flags; + return S_OK; + default: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_NTOBJECTITEM; + *pwFlags = flags; + return S_OK; + } + } + + virtual HRESULT STDMETHODCALLTYPE Extract( + LPCWSTR pszFile, + UINT nIconIndex, + HICON *phiconLarge, + HICON *phiconSmall, + UINT nIconSize) + { + return SHDefExtractIconW(pszFile, nIconIndex, 0, phiconLarge, phiconSmall, nIconSize); + } + + DECLARE_NOT_AGGREGATABLE(CRegistryFolderExtractIcon) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CRegistryFolderExtractIcon) + COM_INTERFACE_ENTRY_IID(IID_IExtractIconW, IExtractIconW) + END_COM_MAP() + +}; + +class CRegistryPidlManager +{ +private: + PWSTR m_ntPath; + + HDPA m_hDpa; + UINT m_hDpaCount; + + int DpaDeleteCallback(RegPidlEntry * info) + { + CoTaskMemFree(info); + return 0; + } + + static int CALLBACK s_DpaDeleteCallback(void *pItem, void *pData) + { + CRegistryPidlManager * mf = (CRegistryPidlManager*) pData; + RegPidlEntry * item = (RegPidlEntry*) pItem; + return mf->DpaDeleteCallback(item); + } + +public: + CRegistryPidlManager() : + m_ntPath(NULL), + m_hDpa(NULL), + m_hDpaCount(0) + { + } + + ~CRegistryPidlManager() + { + DPA_DestroyCallback(m_hDpa, s_DpaDeleteCallback, this); + } + + HRESULT Initialize(PWSTR ntPath) + { + m_ntPath = ntPath; + + m_hDpa = DPA_Create(10); + + if (!m_hDpa) + return E_OUTOFMEMORY; + + HRESULT hr = EnumerateRegistryKey(m_hDpa, m_ntPath, NULL, &m_hDpaCount); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; + } + + HRESULT FindPidlInList(PCUITEMID_CHILD pcidl, RegPidlEntry ** pinfo) + { + HRESULT hr; + + if (!m_hDpa) + { + return E_FAIL; + } + + RegPidlEntry * info = (RegPidlEntry *) pcidl; + if ((info->cb < sizeof(RegPidlEntry)) || (info->magic != REGISTRY_PIDL_MAGIC)) + { + ERR("FindPidlInList: Requested pidl is not of the correct type.\n"); + return E_INVALIDARG; + } + + TRACE("Searching for pidl { cb=%d } in a list of %d items\n", pcidl->mkid.cb, m_hDpaCount); + + for (UINT i = 0; i < m_hDpaCount; i++) + { + RegPidlEntry * pInfo = (RegPidlEntry *) DPA_GetPtr(m_hDpa, i); + ASSERT(pInfo); + + hr = CompareIDs(0, pInfo, pcidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (hr == S_OK) + { + *pinfo = pInfo; + return S_OK; + } + else + { + TRACE("Comparison returned %d\n", (int) (short) (hr & 0xFFFF)); + } + } + + ERR("PIDL NOT FOUND: Requested filename: %S\n", info->entryName); + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + HRESULT FindByName(LPCWSTR strParsingName, RegPidlEntry ** pinfo) + { + if (!m_hDpa) + { + return E_FAIL; + } + + TRACE("Searching for '%S' in a list of %d items\n", strParsingName, m_hDpaCount); + + for (int i = 0; i < (int) m_hDpaCount; i++) + { + RegPidlEntry * pInfo = (RegPidlEntry *) DPA_GetPtr(m_hDpa, i); + ASSERT(pInfo); + + int order = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, + pInfo->entryName, wcslen(pInfo->entryName), + strParsingName, wcslen(strParsingName)); + + if (order == CSTR_EQUAL) + { + *pinfo = pInfo; + return S_OK; + } + } + + TRACE("Pidl not found\n"); + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + HRESULT GetPidl(UINT index, RegPidlEntry ** pEntry) + { + *pEntry = NULL; + + RegPidlEntry * entry = (RegPidlEntry *) DPA_GetPtr(m_hDpa, index); + if (!entry) + { + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + *pEntry = entry; + return S_OK; + } + + HRESULT GetCount(UINT * count) + { + *count = m_hDpaCount; + return S_OK; + } + + + static LPITEMIDLIST CreatePidlFromItem(RegPidlEntry * entry) + { + LPITEMIDLIST idl = (LPITEMIDLIST) CoTaskMemAlloc(entry->cb + 2); + if (!idl) + return NULL; + memset(idl, 0, entry->cb + 2); + memcpy(idl, entry, entry->cb); + return idl; + } + + HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, RegPidlEntry * second) + { + if (LOWORD(lParam) != 0) + return E_INVALIDARG; + + if (second->cb > first->cb) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (second->cb < first->cb) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + if (second->entryNameLength > first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (second->entryNameLength < first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + if (HIWORD(lParam) == SHCIDS_ALLFIELDS) + { + int ord = memcmp(second, first, first->cb); + + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + } + else if (HIWORD(lParam) == SHCIDS_CANONICALONLY) + { + int ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength); + + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + } + else + { + int ord = (int) second->entryType - (int) first->entryType; + + if (ord > 0) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (ord < 0) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength/sizeof(WCHAR)); + + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + } + + return S_OK; + } + + HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, LPCITEMIDLIST pcidl) + { + LPCITEMIDLIST p = pcidl; + RegPidlEntry * second = (RegPidlEntry*) &(p->mkid); + if ((second->cb < sizeof(RegPidlEntry)) || (second->magic != REGISTRY_PIDL_MAGIC)) + return E_INVALIDARG; + + return CompareIDs(lParam, first, second); + } + + HRESULT CompareIDs(LPARAM lParam, LPCITEMIDLIST pcidl1, LPCITEMIDLIST pcidl2) + { + LPCITEMIDLIST p = pcidl1; + RegPidlEntry * first = (RegPidlEntry*) &(p->mkid); + if ((first->cb < sizeof(RegPidlEntry)) || (first->magic != REGISTRY_PIDL_MAGIC)) + return E_INVALIDARG; + + return CompareIDs(lParam, first, pcidl2); + } + + ULONG ConvertAttributes(RegPidlEntry * entry, PULONG inMask) + { + ULONG mask = inMask ? *inMask : 0xFFFFFFFF; + ULONG flags = 0; + + if (entry->entryType == REG_ENTRY_KEY) + flags |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE; + + return flags & mask; + } + + HRESULT FormatContentsForDisplay(RegPidlEntry * info, PCWSTR * strContents) + { + PVOID td = (((PBYTE) info) + FIELD_OFFSET(RegPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); + + if (info->contentsLength > 0) + { + if (info->entryType == REG_ENTRY_VALUE_WITH_CONTENT) + { + switch (info->contentType) + { + case REG_SZ: + case REG_EXPAND_SZ: + { + PWSTR strValue = (PWSTR) CoTaskMemAlloc(info->contentsLength + sizeof(WCHAR)); + StringCbCopyNW(strValue, info->contentsLength + sizeof(WCHAR), (LPCWSTR) td, info->contentsLength); + *strContents = strValue; + return S_OK; + } + case REG_DWORD: + { + DWORD bufferLength = 64 * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbPrintfW(strValue, bufferLength, L"0x%08x (%d)", + *(DWORD*) td, *(DWORD*) td); + *strContents = strValue; + return S_OK; + } + case REG_QWORD: + { + DWORD bufferLength = 64 * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbPrintfW(strValue, bufferLength, L"0x%016llx (%d)", + *(LARGE_INTEGER*) td, ((LARGE_INTEGER*) td)->QuadPart); + *strContents = strValue; + return S_OK; + } + default: + { + PCWSTR strTodo = L"<TODO: Convert value for display>"; + DWORD bufferLength = (wcslen(strTodo) + 1) * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbCopyW(strValue, bufferLength, strTodo); + *strContents = strValue; + return S_OK; + } + } + } + else + { + PCWSTR strTodo = L"<TODO: Query non-embedded value>"; + DWORD bufferLength = (wcslen(strTodo) + 1) * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbCopyW(strValue, bufferLength, strTodo); + *strContents = strValue; + return S_OK; + } + } + else + { + PCWSTR strEmpty = L"(Empty)"; + DWORD bufferLength = (wcslen(strEmpty)+1) * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbCopyW(strValue, bufferLength, strEmpty); + *strContents = strValue; + return S_OK; + } + + } + +}; + +class CRegistryFolderEnum : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IEnumIDList +{ +private: + CComPtr<CRegistryFolder> m_Folder; + + HWND m_HwndOwner; + SHCONTF m_Flags; + + UINT m_Index; + UINT m_Count; + +public: + CRegistryFolderEnum() : + m_HwndOwner(NULL), + m_Flags(0), + m_Index(0), + m_Count(0) + { + } + + virtual ~CRegistryFolderEnum() + { + } + + HRESULT Initialize(CRegistryFolder * folder, HWND hwndOwner, SHCONTF flags) + { + m_Folder = folder; + + m_Folder->GetManager().GetCount(&m_Count); + + m_HwndOwner = hwndOwner; + m_Flags = flags; + + return Reset(); + } + + virtual HRESULT STDMETHODCALLTYPE Next( + ULONG celt, + LPITEMIDLIST *rgelt, + ULONG *pceltFetched) + { + if (pceltFetched) + *pceltFetched = 0; + + if (m_Index >= m_Count) + return S_FALSE; + + for (int i = 0; i < (int) celt;) + { + RegPidlEntry * tinfo; + BOOL flagsOk = FALSE; + + do { + HRESULT hr = m_Folder->GetManager().GetPidl(m_Index++, &tinfo); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + switch (tinfo->entryType) + { + case REG_ENTRY_KEY: + flagsOk = (m_Flags & SHCONTF_FOLDERS) != 0; + break; + default: + flagsOk = (m_Flags & SHCONTF_NONFOLDERS) != 0; + break; + } + } while (m_Index < m_Count && !flagsOk); + + if (flagsOk) + { + if (rgelt) + rgelt[i] = m_Folder->GetManager().CreatePidlFromItem(tinfo); + i++; + } + + if (m_Index == m_Count) + { + if (pceltFetched) + *pceltFetched = i; + return (i == (int) celt) ? S_OK : S_FALSE; + } + } + + if (pceltFetched) *pceltFetched = celt; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt) + { + return Next(celt, NULL, NULL); + } + + virtual HRESULT STDMETHODCALLTYPE Reset() + { + m_Index = 0; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE Clone(IEnumIDList **ppenum) + { + return ShellObjectCreatorInit<CRegistryFolderEnum>(m_Folder, m_HwndOwner, m_Flags, IID_PPV_ARG(IEnumIDList, ppenum)); + } + + DECLARE_NOT_AGGREGATABLE(CRegistryFolderEnum) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CRegistryFolderEnum) + COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) + END_COM_MAP() + +}; + +//----------------------------------------------------------------------------- +// CRegistryFolder + +CRegistryFolder::CRegistryFolder() : + m_PidlManager(NULL), + m_shellPidl(NULL) +{ +} + +CRegistryFolder::~CRegistryFolder() +{ + TRACE("Destroying CRegistryFolder %p\n", this); +} + +// IShellFolder +HRESULT STDMETHODCALLTYPE CRegistryFolder::ParseDisplayName( + HWND hwndOwner, + LPBC pbcReserved, + LPOLESTR lpszDisplayName, + ULONG *pchEaten, + LPITEMIDLIST *ppidl, + ULONG *pdwAttributes) +{ + HRESULT hr; + RegPidlEntry * info; + + if (!ppidl) + return E_POINTER; + + if (pchEaten) + *pchEaten = 0; + + if (pdwAttributes) + *pdwAttributes = 0; + + TRACE("CRegistryFolder::ParseDisplayName name=%S (ntPath=%S)\n", lpszDisplayName, m_NtPath); + + hr = m_PidlManager->FindByName(lpszDisplayName, &info); + if (FAILED(hr)) + { + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + *ppidl = m_PidlManager->CreatePidlFromItem(info); + + if (pchEaten) + *pchEaten = wcslen(info->entryName); + + if (pdwAttributes) + *pdwAttributes = m_PidlManager->ConvertAttributes(info, pdwAttributes); + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::EnumObjects( + HWND hwndOwner, + SHCONTF grfFlags, + IEnumIDList **ppenumIDList) +{ + return ShellObjectCreatorInit<CRegistryFolderEnum>(this, hwndOwner, grfFlags, IID_PPV_ARG(IEnumIDList, ppenumIDList)); +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::BindToObject( + LPCITEMIDLIST pidl, + LPBC pbcReserved, + REFIID riid, + void **ppvOut) +{ + RegPidlEntry * info; + HRESULT hr; + + if (IsEqualIID(riid, IID_IShellFolder)) + { + hr = m_PidlManager->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + +#if 0 + if (!(info->objectInformation.GrantedAccess & (STANDARD_RIGHTS_READ | FILE_LIST_DIRECTORY))) + return E_ACCESSDENIED; +#endif + + WCHAR path[MAX_PATH]; + + StringCbCopyW(path, _countof(path), m_NtPath); + + PathAppendW(path, info->entryName); + + LPITEMIDLIST first = ILCloneFirst(pidl); + LPCITEMIDLIST rest = ILGetNext(pidl); + + LPITEMIDLIST fullPidl = ILCombine(m_shellPidl, first); + + CComPtr<IShellFolder> psfChild; + hr = ShellObjectCreatorInit<CRegistryFolder>(fullPidl, path, IID_PPV_ARG(IShellFolder, &psfChild)); + + ILFree(fullPidl); + ILFree(first); + + if (rest->mkid.cb > 0) + { + return psfChild->BindToObject(rest, pbcReserved, riid, ppvOut); + } + + return psfChild->QueryInterface(riid, ppvOut); + } + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::BindToStorage( + LPCITEMIDLIST pidl, + LPBC pbcReserved, + REFIID riid, + void **ppvObj) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::CompareIDs( + LPARAM lParam, + LPCITEMIDLIST pidl1, + LPCITEMIDLIST pidl2) +{ + TRACE("CompareIDs\n"); + return m_PidlManager->CompareIDs(lParam, pidl1, pidl2); +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::CreateViewObject( + HWND hwndOwner, + REFIID riid, + void **ppvOut) +{ + if (!IsEqualIID(riid, IID_IShellView)) + return E_NOINTERFACE; + + SFV_CREATE sfv; + sfv.cbSize = sizeof(sfv); + sfv.pshf = this; + sfv.psvOuter = NULL; + sfv.psfvcb = NULL; + + return SHCreateShellFolderView(&sfv, (IShellView**) ppvOut); +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::GetAttributesOf( + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + SFGAOF *rgfInOut) +{ + RegPidlEntry * info; + HRESULT hr; + + TRACE("GetAttributesOf\n"); + + if (cidl == 0) + { + *rgfInOut &= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE; + return S_OK; + } + + for (int i = 0; i < (int) cidl; i++) + { + PCUITEMID_CHILD pidl = apidl[i]; + + hr = m_PidlManager->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + // Update attributes. + *rgfInOut = m_PidlManager->ConvertAttributes(info, rgfInOut); + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::GetUIObjectOf( + HWND hwndOwner, + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + REFIID riid, + UINT *prgfInOut, + void **ppvOut) +{ + TRACE("GetUIObjectOf\n"); + + if (IsEqualIID(riid, IID_IContextMenu)) + { + return ShellObjectCreatorInit<CRegistryFolderContextMenu>(m_shellPidl, cidl, apidl, riid, ppvOut); + //return CDefFolderMenu_Create2(m_shellPidl, hwndOwner, cidl, apidl, this, ContextMenuCallback, 0, NULL, (IContextMenu**) ppvOut); + } + + if (IsEqualIID(riid, IID_IExtractIconW)) + { + return ShellObjectCreatorInit<CRegistryFolderExtractIcon>(m_shellPidl, cidl, apidl, riid, ppvOut); + } + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::GetDisplayNameOf( + LPCITEMIDLIST pidl, + SHGDNF uFlags, + STRRET *lpName) +{ + RegPidlEntry * info; + HRESULT hr; + + TRACE("GetDisplayNameOf %p\n", pidl); + + hr = m_PidlManager->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if ((GET_SHGDN_RELATION(uFlags) == SHGDN_NORMAL) && + (GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING)) + { + WCHAR path[MAX_PATH] = { 0 }; + + hr = GetFullName(m_shellPidl, uFlags, path, _countof(path)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + PathAppendW(path, info->entryName); + + hr = MakeStrRetFromString(path, lpName); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + LPCITEMIDLIST pidlNext = ILGetNext(pidl); + + if (pidlNext && pidlNext->mkid.cb > 0) + { + CComPtr<IShellFolder> psfChild; + hr = BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + WCHAR temp[MAX_PATH]; + STRRET childName; + + hr = psfChild->GetDisplayNameOf(pidlNext, uFlags | SHGDN_INFOLDER, &childName); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = StrRetToBufW(&childName, pidlNext, temp, _countof(temp)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + PathAppendW(path, temp); + } + } + else + { + MakeStrRetFromString(info->entryName, info->entryNameLength, lpName); + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::SetNameOf( + HWND hwnd, + LPCITEMIDLIST pidl, + LPCOLESTR lpszName, + SHGDNF uFlags, + LPITEMIDLIST *ppidlOut) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// IPersist +HRESULT STDMETHODCALLTYPE CRegistryFolder::GetClassID(CLSID *lpClassId) +{ + if (!lpClassId) + return E_POINTER; + + *lpClassId = CLSID_RegistryFolder; + return S_OK; +} + +// IPersistFolder +HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl) +{ + m_shellPidl = ILClone(pidl); + + PCWSTR ntPath = L"\\REGISTRY"; + +#if 0 + WCHAR debugTemp[MAX_PATH]; + GetFullName(m_shellPidl, SHGDN_FORPARSING, debugTemp, _countof(debugTemp)); + DbgPrint("INITIALIZE CRegistryFolder PIDL PATH: %S (ntPath: %S)\n", debugTemp, ntPath); + + if (ntPath[wcslen(ntPath) - 1] == L'\\' && debugTemp[wcslen(debugTemp) - 1] != L'\\') + wcscat(debugTemp, L"\\"); + + PCWSTR guidTemp = L"::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"; + + PCWSTR findTemp = StrStrW(debugTemp, guidTemp); + PCWSTR nextTemp = findTemp + wcslen(guidTemp); + + if (wcscmp(nextTemp, ntPath)) + { + DbgPrint("WHAT THE F, the NT PATH DOES NOT MATCH\n"); + return E_FAIL; + } +#endif + + if (!m_PidlManager) + { + m_PidlManager = new CRegistryPidlManager(); + + StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); + } + + return m_PidlManager->Initialize(m_NtPath); +} + +// Internal +HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath) +{ + m_shellPidl = ILClone(pidl); + +#if 0 + WCHAR debugTemp[MAX_PATH]; + GetFullName(m_shellPidl, SHGDN_FORPARSING, debugTemp, _countof(debugTemp)); + DbgPrint("INITIALIZE CRegistryFolder PIDL PATH: %S (ntPath: %S)\n", debugTemp, ntPath); + + if (ntPath[wcslen(ntPath) - 1] == L'\\' && debugTemp[wcslen(debugTemp) - 1] != L'\\') + wcscat(debugTemp, L"\\"); + + PCWSTR guidTemp = L"::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"; + + PCWSTR findTemp = StrStrW(debugTemp, guidTemp); + PCWSTR nextTemp = findTemp + wcslen(guidTemp); + + if (wcscmp(nextTemp, ntPath)) + { + DbgPrint("WHAT THE F, the NT PATH DOES NOT MATCH\n"); + return E_FAIL; + } +#endif + + if (!m_PidlManager) + m_PidlManager = new CRegistryPidlManager(); + + StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); + return m_PidlManager->Initialize(m_NtPath); +} + +// IPersistFolder2 +HRESULT STDMETHODCALLTYPE CRegistryFolder::GetCurFolder(LPITEMIDLIST * pidl) +{ + if (pidl) + *pidl = ILClone(m_shellPidl); + if (!m_shellPidl) + return S_FALSE; + return S_OK; +} + +// IShellFolder2 +HRESULT STDMETHODCALLTYPE CRegistryFolder::GetDefaultSearchGUID( + GUID *lpguid) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::EnumSearches( + IEnumExtraSearch **ppenum) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::GetDefaultColumn( + DWORD dwReserved, + ULONG *pSort, + ULONG *pDisplay) +{ + if (pSort) + *pSort = 0; + if (pDisplay) + *pDisplay = 0; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::GetDefaultColumnState( + UINT iColumn, + SHCOLSTATEF *pcsFlags) +{ + switch (iColumn) + { + case REGISTRY_COLUMN_NAME: + *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT; + return S_OK; + case REGISTRY_COLUMN_TYPE: + *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT; + return S_OK; + case REGISTRY_COLUMN_VALUE: + *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT | SHCOLSTATE_SLOW; + return S_OK; + } + + return E_INVALIDARG; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::GetDetailsEx( + LPCITEMIDLIST pidl, + const SHCOLUMNID *pscid, + VARIANT *pv) +{ + RegPidlEntry * info; + HRESULT hr; + + TRACE("GetDetailsEx\n"); + + if (pidl) + { + hr = m_PidlManager->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + static const GUID storage = PSGUID_STORAGE; + if (IsEqualGUID(pscid->fmtid, storage)) + { + if (pscid->pid == PID_STG_NAME) + { + return MakeVariantString(pv, info->entryName); + } + else if (pscid->pid == PID_STG_STORAGETYPE) + { + return MakeVariantString(pv, RegistryTypeNames[info->entryType]); + } + else if (pscid->pid == PID_STG_CONTENTS) + { + PCWSTR strValueContents; + + hr = m_PidlManager->FormatContentsForDisplay(info, &strValueContents); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (hr == S_FALSE) + { + V_VT(pv) = VT_EMPTY; + return S_OK; + } + + hr = MakeVariantString(pv, strValueContents); + + CoTaskMemFree((PVOID)strValueContents); + + return hr; + + } + } + } + + return E_INVALIDARG; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::GetDetailsOf( + LPCITEMIDLIST pidl, + UINT iColumn, + SHELLDETAILS *psd) +{ + RegPidlEntry * info; + HRESULT hr; + + TRACE("GetDetailsOf\n"); + + if (pidl) + { + hr = m_PidlManager->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + switch (iColumn) + { + case REGISTRY_COLUMN_NAME: + psd->fmt = LVCFMT_LEFT; + + if (info->entryNameLength > 0) + { + return MakeStrRetFromString(info->entryName, info->entryNameLength, &(psd->str)); + } + return MakeStrRetFromString(L"(Default)", &(psd->str)); + + case REGISTRY_COLUMN_TYPE: + psd->fmt = LVCFMT_LEFT; + + return MakeStrRetFromString(RegistryTypeNames[info->entryType], &(psd->str)); + + case REGISTRY_COLUMN_VALUE: + psd->fmt = LVCFMT_LEFT; + + PCWSTR strValueContents; + + hr = m_PidlManager->FormatContentsForDisplay(info, &strValueContents); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (hr == S_FALSE) + { + return MakeStrRetFromString(L"(Empty)", &(psd->str)); + } + + hr = MakeStrRetFromString(strValueContents, &(psd->str)); + + CoTaskMemFree((PVOID) strValueContents); + + return hr; + } + } + else + { + switch (iColumn) + { + case REGISTRY_COLUMN_NAME: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 30; + + // TODO: Make localizable + MakeStrRetFromString(L"Object Name", &(psd->str)); + return S_OK; + case REGISTRY_COLUMN_TYPE: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 20; + + // TODO: Make localizable + MakeStrRetFromString(L"Content Type", &(psd->str)); + return S_OK; + case REGISTRY_COLUMN_VALUE: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 20; + + // TODO: Make localizable + MakeStrRetFromString(L"Value", &(psd->str)); + return S_OK; + } + } + + return E_INVALIDARG; +} + +HRESULT STDMETHODCALLTYPE CRegistryFolder::MapColumnToSCID( + UINT iColumn, + SHCOLUMNID *pscid) +{ + static const GUID storage = PSGUID_STORAGE; + switch (iColumn) + { + case REGISTRY_COLUMN_NAME: + pscid->fmtid = storage; + pscid->pid = PID_STG_NAME; + return S_OK; + case REGISTRY_COLUMN_TYPE: + pscid->fmtid = storage; + pscid->pid = PID_STG_STORAGETYPE; + return S_OK; + case REGISTRY_COLUMN_VALUE: + pscid->fmtid = storage; + pscid->pid = PID_STG_CONTENTS; + return S_OK; + } + return E_INVALIDARG; +} Propchange: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.h (added) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] Mon Feb 23 17:13:32 2015 @@ -0,0 +1,149 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\stobject\stobject.cpp + * PURPOSE: Systray shell service object + * PROGRAMMERS: Robert Naumann + David Quintana <gigaherz(a)gmail.com> + */ +#pragma once + +extern const GUID CLSID_RegistryFolder; + +class CRegistryPidlManager; + +class CRegistryFolder : + public CComCoClass<CRegistryFolder, &CLSID_RegistryFolder>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IShellFolder2, + public IPersistFolder2 +{ + CRegistryPidlManager * m_PidlManager; + + WCHAR m_NtPath[MAX_PATH]; + + LPITEMIDLIST m_shellPidl; + +public: + + CRegistryFolder(); + virtual ~CRegistryFolder(); + + CRegistryPidlManager& GetManager() { return *m_PidlManager; } + + // IShellFolder + virtual HRESULT STDMETHODCALLTYPE ParseDisplayName( + HWND hwndOwner, + LPBC pbcReserved, + LPOLESTR lpszDisplayName, + ULONG *pchEaten, + LPITEMIDLIST *ppidl, + ULONG *pdwAttributes); + + virtual HRESULT STDMETHODCALLTYPE EnumObjects( + HWND hwndOwner, + SHCONTF grfFlags, + IEnumIDList **ppenumIDList); + + virtual HRESULT STDMETHODCALLTYPE BindToObject( + LPCITEMIDLIST pidl, + LPBC pbcReserved, + REFIID riid, + void **ppvOut); + + virtual HRESULT STDMETHODCALLTYPE BindToStorage( + LPCITEMIDLIST pidl, + LPBC pbcReserved, + REFIID riid, + void **ppvObj); + + virtual HRESULT STDMETHODCALLTYPE CompareIDs( + LPARAM lParam, + LPCITEMIDLIST pidl1, + LPCITEMIDLIST pidl2); + + virtual HRESULT STDMETHODCALLTYPE CreateViewObject( + HWND hwndOwner, + REFIID riid, + void **ppvOut); + + virtual HRESULT STDMETHODCALLTYPE GetAttributesOf( + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + SFGAOF *rgfInOut); + + virtual HRESULT STDMETHODCALLTYPE GetUIObjectOf( + HWND hwndOwner, + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + REFIID riid, + UINT *prgfInOut, + void **ppvOut); + + virtual HRESULT STDMETHODCALLTYPE GetDisplayNameOf( + LPCITEMIDLIST pidl, + SHGDNF uFlags, + STRRET *lpName); + + virtual HRESULT STDMETHODCALLTYPE SetNameOf( + HWND hwnd, + LPCITEMIDLIST pidl, + LPCOLESTR lpszName, + SHGDNF uFlags, + LPITEMIDLIST *ppidlOut); + + // IShellFolder2 + virtual HRESULT STDMETHODCALLTYPE GetDefaultSearchGUID( + GUID *lpguid); + + virtual HRESULT STDMETHODCALLTYPE EnumSearches( + IEnumExtraSearch **ppenum); + + virtual HRESULT STDMETHODCALLTYPE GetDefaultColumn( + DWORD dwReserved, + ULONG *pSort, + ULONG *pDisplay); + + virtual HRESULT STDMETHODCALLTYPE GetDefaultColumnState( + UINT iColumn, + SHCOLSTATEF *pcsFlags); + + virtual HRESULT STDMETHODCALLTYPE GetDetailsEx( + LPCITEMIDLIST pidl, + const SHCOLUMNID *pscid, + VARIANT *pv); + + virtual HRESULT STDMETHODCALLTYPE GetDetailsOf( + LPCITEMIDLIST pidl, + UINT iColumn, + SHELLDETAILS *psd); + + virtual HRESULT STDMETHODCALLTYPE MapColumnToSCID( + UINT iColumn, + SHCOLUMNID *pscid); + + // IPersist + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *lpClassId); + + // IPersistFolder + virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); + + // IPersistFolder2 + virtual HRESULT STDMETHODCALLTYPE GetCurFolder(LPITEMIDLIST * pidl); + + // Internal + HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath); + + DECLARE_REGISTRY_RESOURCEID(IDR_NTOBJECTFOLDER) + DECLARE_NOT_AGGREGATABLE(CRegistryFolder) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CRegistryFolder) + COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder) + 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) + END_COM_MAP() + +}; Propchange: trunk/reactos/dll/shellext/ntobjshex/regfolder.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/shellext/ntobjshex/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/resource.h [iso-8859-1] Mon Feb 23 17:13:32 2015 @@ -7,6 +7,9 @@ #define IDI_NTOBJECTDEVICE 5 #define IDI_NTOBJECTPORT 6 +#define IDI_REGISTRYKEY 32 +#define IDI_REGISTRYVALUE 33 + #define IDS_NAME 101 #define IDR_NTOBJECTFOLDER 1001 Added: trunk/reactos/dll/shellext/ntobjshex/util.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/uti… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/util.h (added) +++ trunk/reactos/dll/shellext/ntobjshex/util.h [iso-8859-1] Mon Feb 23 17:13:32 2015 @@ -0,0 +1,44 @@ +#pragma once + +#ifndef INLINE +#define INLINE inline +#endif + +HRESULT INLINE MakeStrRetFromString(LPCWSTR string, DWORD cbLength, STRRET * str) +{ + str->uType = STRRET_WSTR; + + DWORD blen = cbLength + sizeof(WCHAR); + str->pOleStr = (LPWSTR) CoTaskMemAlloc(blen); + return StringCbCopyNW(str->pOleStr, blen, string, cbLength); +} + +HRESULT INLINE MakeStrRetFromString(LPCWSTR string, STRRET * str) +{ + DWORD stringLength = wcslen(string) * sizeof(WCHAR); + return MakeStrRetFromString(string, stringLength, str); +} + +HRESULT INLINE MakeVariantString(VARIANT * pv, PCWSTR string) +{ + V_VT(pv) = VT_BSTR; + V_BSTR(pv) = SysAllocString(string); + return S_OK; +} + +HRESULT INLINE GetFullName(PCIDLIST_ABSOLUTE pidl, DWORD uFlags, PWSTR strName, DWORD cchName) +{ + CComPtr<IShellFolder> psfDesktop; + STRRET str; + HRESULT hr; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = psfDesktop->GetDisplayNameOf(pidl, uFlags, &str); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return StrRetToBufW(&str, pidl, strName, cchName); +} Propchange: trunk/reactos/dll/shellext/ntobjshex/util.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 66425: [NTOBJSHEX] - Fix headers. - Fix MSVC warning C4200: nonstandard extension used : zero-sized array in struct/union. [PSDK] Fix MSVC warning C4200: nonstandard extension used : zer...
by hbelusca＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: hbelusca Date: Mon Feb 23 16:28:13 2015 New Revision: 66425 URL: http://svn.reactos.org/svn/reactos?rev=66425&view=rev Log: [NTOBJSHEX] - Fix headers. - Fix MSVC warning C4200: nonstandard extension used : zero-sized array in struct/union. [PSDK] Fix MSVC warning C4200: nonstandard extension used : zero-sized array in struct/union. Note to Wine synchronizers and PSDK maintainers: those MIB* structures should go into a tcpmib.h header instead. Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjns.h trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h trunk/reactos/include/psdk/iprtrmib.h Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] Mon Feb 23 16:28:13 2015 @@ -1,10 +1,10 @@ /* -* PROJECT: ReactOS shell extensions -* LICENSE: GPL - See COPYING in the top level directory -* FILE: dll\shellext\ntobjshex\ntobjns.cpp -* PURPOSE: NT Object Namespace shell extension -* PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> -*/ + * PROJECT: ReactOS shell extensions + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\shellext\ntobjshex\ntobjns.cpp + * PURPOSE: NT Object Namespace shell extension + * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> + */ #include "precomp.h" #include "ntobjutil.h" Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.h [iso-8859-1] Mon Feb 23 16:28:13 2015 @@ -1,10 +1,9 @@ /* - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\win32\stobject\stobject.cpp - * PURPOSE: Systray shell service object - * PROGRAMMERS: Robert Naumann - David Quintana <gigaherz(a)gmail.com> + * FILE: dll\shellext\ntobjshex\ntobjns.h + * PURPOSE: NT Object Namespace shell extension + * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ #pragma once Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] Mon Feb 23 16:28:13 2015 @@ -1,10 +1,9 @@ /* - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\win32\stobject\stobject.cpp - * PURPOSE: COM registration services for STobject.dll - * PROGRAMMERS: Robert Naumann - David Quintana <gigaherz(a)gmail.com> + * FILE: dll\shellext\ntobjshex\ntobjshex.cpp + * PURPOSE: NT Object Namespace shell extension + * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ #include "precomp.h" Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] Mon Feb 23 16:28:13 2015 @@ -22,7 +22,7 @@ #include <ndk/rtlfuncs.h> } -// All the possible values are defined here because I want the type field to be +// All the possible values are defined here because I want the type field to be // "persistable" and not change if more types are added in the future. enum OBJECT_TYPE { DIRECTORY_OBJECT, SYMBOLICLINK_OBJECT, @@ -34,7 +34,7 @@ UNKNOWN_OBJECT_TYPE = -1 }; -extern const LPCWSTR ObjectTypeNames []; +extern const LPCWSTR ObjectTypeNames[]; #define NT_OBJECT_PIDL_MAGIC (USHORT)0x9A03 @@ -45,25 +45,25 @@ USHORT magic; // 0x9A03 ~~~ "NTOB" // If this is -1, there will be a NtPidlTypeData following this, and before any other extensions - OBJECT_TYPE objectType; + OBJECT_TYPE objectType; OBJECT_BASIC_INFORMATION objectInformation; USHORT entryNameLength; - WCHAR entryName[0]; + WCHAR entryName[ANYSIZE_ARRAY]; }; struct NtPidlTypeData { USHORT typeNameLength; - WCHAR typeName[0]; + WCHAR typeName[ANYSIZE_ARRAY]; }; struct NtPidlSymlinkData { USHORT targetNameLength; - WCHAR targetName[0]; + WCHAR targetName[ANYSIZE_ARRAY]; }; #include <poppack.h> Modified: trunk/reactos/include/psdk/iprtrmib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/iprtrmib.h?re… ============================================================================== --- trunk/reactos/include/psdk/iprtrmib.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/iprtrmib.h [iso-8859-1] Mon Feb 23 16:28:13 2015 @@ -327,7 +327,7 @@ typedef struct { DWORD dwNumEntries; - MIB_TCPROW_OWNER_PID table[0]; + MIB_TCPROW_OWNER_PID table[1]; } MIB_TCPTABLE_OWNER_PID, *PMIB_TCPTABLE_OWNER_PID;

1 0

[tfaber] 66424: [IDL] - Fix duplicate attribute warning
by tfaber＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: tfaber Date: Mon Feb 23 15:58:49 2015 New Revision: 66424 URL: http://svn.reactos.org/svn/reactos?rev=66424&view=rev Log: [IDL] - Fix duplicate attribute warning Modified: trunk/reactos/include/reactos/idl/wkssvc.idl Modified: trunk/reactos/include/reactos/idl/wkssvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wkssvc… ============================================================================== --- trunk/reactos/include/reactos/idl/wkssvc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/wkssvc.idl [iso-8859-1] Mon Feb 23 15:58:49 2015 @@ -334,7 +334,7 @@ [ - uuid(6BFFD098-A112-3610-9833-46C3F87E345A),version(1.0), + uuid(6BFFD098-A112-3610-9833-46C3F87E345A), version(1.0), pointer_default(unique), endpoint("ncacn_np:[\\pipe\\wkssvc]")

1 0

[tfaber] 66423: [WBEMPROX] - Implement Win32_ComputerSystem.UserName - Fix buffer size in get_computername CORE-8678 #resolve
by tfaber＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: tfaber Date: Mon Feb 23 15:25:29 2015 New Revision: 66423 URL: http://svn.reactos.org/svn/reactos?rev=66423&view=rev Log: [WBEMPROX] - Implement Win32_ComputerSystem.UserName - Fix buffer size in get_computername CORE-8678 #resolve Modified: trunk/reactos/dll/win32/wbemprox/builtin.c trunk/rostests/winetests/wbemprox/query.c Modified: trunk/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Mon Feb 23 15:25:29 2015 @@ -291,6 +291,8 @@ {'T','y','p','e',0}; static const WCHAR prop_uniqueidW[] = {'U','n','i','q','u','e','I','d',0}; +static const WCHAR prop_usernameW[] = + {'U','s','e','r','N','a','m','e',0}; static const WCHAR prop_uuidW[] = {'U','U','I','D',0}; static const WCHAR prop_varianttypeW[] = @@ -343,7 +345,8 @@ { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_numprocessorsW, CIM_UINT32, VT_I4 }, - { prop_totalphysicalmemoryW, CIM_UINT64 } + { prop_totalphysicalmemoryW, CIM_UINT64 }, + { prop_usernameW, CIM_STRING } }; static const struct column col_compsysproduct[] = { @@ -690,6 +693,7 @@ UINT32 num_logical_processors; UINT32 num_processors; UINT64 total_physical_memory; + const WCHAR *username; }; struct record_computersystemproduct { @@ -1106,10 +1110,28 @@ static WCHAR *get_computername(void) { WCHAR *ret; - DWORD size = MAX_COMPUTERNAME_LENGTH; + DWORD size = MAX_COMPUTERNAME_LENGTH + 1; if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) return NULL; GetComputerNameW( ret, &size ); + return ret; +} + +static WCHAR *get_username(void) +{ + WCHAR *ret; + DWORD compsize, usersize; + DWORD size; + + compsize = 0; + GetComputerNameW( NULL, &compsize ); + usersize = 0; + GetUserNameW( NULL, &usersize ); + size = compsize + usersize; /* two null terminators account for the \ */ + if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) return NULL; + GetComputerNameW( ret, &compsize ); + ret[compsize] = '\\'; + GetUserNameW( ret + compsize + 1, &usersize ); return ret; } @@ -1131,6 +1153,7 @@ rec->num_logical_processors = get_logical_processor_count( NULL ); rec->num_processors = get_processor_count(); rec->total_physical_memory = get_total_physical_memory(); + rec->username = get_username(); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; Modified: trunk/rostests/winetests/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/query.… ============================================================================== --- trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] Mon Feb 23 15:25:29 2015 @@ -340,6 +340,74 @@ IWbemClassObject_Release( out ); } +static void test_Win32_ComputerSystem( IWbemServices *services ) +{ + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR usernameW[] = {'U','s','e','r','N','a','m','e',0}; + static const WCHAR backslashW[] = {'\\',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *service; + VARIANT value; + CIMTYPE type; + HRESULT hr; + WCHAR compname[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR username[128]; + DWORD len, count; + + len = sizeof(compname) / sizeof(compname[0]); + if (!GetComputerNameW( compname, &len )) + compname[0] = 0; + + lstrcpyW( username, compname ); + lstrcatW( username, backslashW ); + len = sizeof(username) / sizeof(username[0]) - lstrlenW( username ); + if (!GetUserNameW( username + lstrlenW( username ), &len )) + username[0] = 0; + + if (!compname[0] || !username[0]) + { + skip( "Failed to get user or computer name\n" ); + return; + } + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_ComputerSystem not available\n" ); + return; + } + + IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( service, nameW, 0, &value, &type, NULL ); + ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( !lstrcmpiW( V_BSTR( &value ), compname ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(compname) ); + VariantClear( &value ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( service, usernameW, 0, &value, &type, NULL ); + ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( !lstrcmpiW( V_BSTR( &value ), username ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(username) ); + VariantClear( &value ); + + IWbemClassObject_Release( service ); + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_StdRegProv( IWbemServices *services ) { static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -755,6 +823,7 @@ test_select( services ); test_Win32_Process( services ); test_Win32_Service( services ); + test_Win32_ComputerSystem( services ); test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services );

1 0

[gadamopoulos] 66422: [COM_APITEST] - Test the interfaces of CLSID_SharedTaskScheduler and CLSID_BackgroundTaskScheduler
by gadamopoulos＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: gadamopoulos Date: Mon Feb 23 13:49:43 2015 New Revision: 66422 URL: http://svn.reactos.org/svn/reactos?rev=66422&view=rev Log: [COM_APITEST] - Test the interfaces of CLSID_SharedTaskScheduler and CLSID_BackgroundTaskScheduler Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Mon Feb 23 13:49:43 2015 @@ -256,6 +256,20 @@ { 0x10, &IID_IObjectWithSite }, }, L"Both" + }, + { + ID_NAME(CLSID_SharedTaskScheduler), + { + { 0x0, &IID_IShellTaskScheduler }, + { 0x0, &IID_IUnknown }, + } + }, + { + ID_NAME(CLSID_BackgroundTaskScheduler), + { + { 0x0, &IID_IShellTaskScheduler }, + { 0x0, &IID_IUnknown }, + } } }; static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Mon Feb 23 13:49:43 2015 @@ -235,6 +235,7 @@ { ID_NAME(IID_FolderItems3) }, { ID_NAME(IID_FolderItemVerb) }, { ID_NAME(IID_FolderItemVerbs) }, + { ID_NAME(IID_IShellTaskScheduler) }, { ID_NAME(CLSID_ShellDesktop), TRUE } };

1 0

[gadamopoulos] 66421: [HEADERS] - Define CLSID_BackgroundTaskScheduler and CLSID_SharedTaskScheduler - Properly define IShellTaskScheduler and IID_IShellTaskScheduler
by gadamopoulos＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: gadamopoulos Date: Mon Feb 23 13:43:51 2015 New Revision: 66421 URL: http://svn.reactos.org/svn/reactos?rev=66421&view=rev Log: [HEADERS] - Define CLSID_BackgroundTaskScheduler and CLSID_SharedTaskScheduler - Properly define IShellTaskScheduler and IID_IShellTaskScheduler Modified: trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/reactos/shlguid_undoc.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Mon Feb 23 13:43:51 2015 @@ -2310,39 +2310,6 @@ #define IDockingWindowSite_SetBorderSpaceDW(p,a,b) (p)->lpVtbl->SetBorderSpaceDW(p,a,b) #endif -/***************************************************************************** - * IShellTaskScheduler interface - */ -#define REFTASKOWNERID REFGUID - -#define INTERFACE IShellTaskScheduler -DECLARE_INTERFACE_(IShellTaskScheduler, IUnknown) -{ - // *** IUnknown methods *** - STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; - - // *** IShellTaskScheduler methods *** - STDMETHOD(AddTask)(THIS_ IRunnableTask *pTask, REFTASKOWNERID rtoid, DWORD_PTR lParam, DWORD dwPriority) PURE; - STDMETHOD(RemoveTasks)(THIS_ REFTASKOWNERID rtoid, DWORD_PTR lParam, BOOL fWaitIfRunning) PURE; - STDMETHOD_(UINT, CountTasks)(THIS_ REFTASKOWNERID rtoid) PURE; - STDMETHOD(Status)(THIS_ DWORD dwReleaseStatus, DWORD dwThreadTimeout) PURE; -}; -#undef INTERFACE - -#if !defined(__cplusplus) || defined(CINTERFACE) -/*** IUnknown methods ***/ -#define IShellTaskScheduler_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IShellTaskScheduler_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IShellTaskScheduler_Release(p) (p)->lpVtbl->Release(p) -/*** IShellTaskScheduler methods ***/ -#define IShellTaskScheduler_AddTask(p,a,b,c,d) (p)->lpVtbl->AddTask(p,a,b,c,d) -#define IShellTaskScheduler_RemoveTasks(p,a,b,c) (p)->lpVtbl->RemoveTasks(p,a,b,c) -#define IShellTaskScheduler_CountTasks(p,a) (p)->lpVtbl->CountTasks(p,a) -#define IShellTaskScheduler_Status(p,a,b) (p)->lpVtbl->Status(p,a,b) -#endif - typedef void (CALLBACK *PFNASYNCICONTASKBALLBACK)(LPCITEMIDLIST pidl, LPVOID pvData, LPVOID pvHint, INT iIconIndex, INT iOpenIconIndex); /***************************************************************************** Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Mon Feb 23 13:43:51 2015 @@ -4191,3 +4191,26 @@ HRESULT GetAnyOperationsAborted( [out] BOOL *pfAnyOperationsAborted); }; + +[ + uuid(6CCB7BE0-6807-11d0-B810-00C04FD706EC), + object, + pointer_default(unique) +] +interface IShellTaskScheduler : IUnknown +{ + HRESULT AddTask( + [in] IRunnableTask *pTask, + [in] REFGUID rtoid, + [in] DWORD_PTR lParam, + [in] DWORD dwPriority); + HRESULT RemoveTasks( + [in] REFGUID rtoid, + [in] DWORD_PTR lParam, + [in] BOOL fWaitIfRunning); + UINT CountTasks( + [in] REFGUID rtoid); + HRESULT Status( + [in] DWORD dwReleaseStatus, + [in] DWORD dwThreadTimeout); +} Modified: trunk/reactos/include/reactos/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_un… ============================================================================== --- trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] Mon Feb 23 13:43:51 2015 @@ -120,6 +120,8 @@ DEFINE_GUID(CLSID_SysTray, 0x35CEC8A3, 0x2BE6, 0x11D2, 0x87, 0x73, 0x92, 0xE2, 0x20, 0x52, 0x41, 0x53); +DEFINE_GUID(CLSID_BackgroundTaskScheduler, 0x603D3800, 0xBD81, 0x11d0, 0xA3, 0xA5, 0x00, 0xC0, 0x4F, 0xD7, 0x06, 0xEC); +DEFINE_GUID(CLSID_SharedTaskScheduler, 0x603D3801, 0xBD81, 0x11d0, 0xA3, 0xA5, 0x00, 0xC0, 0x4F, 0xD7, 0x06, 0xEC); #define CLSID_ConnectionTray CLSID_LanConnectStatusUI

1 0

[akhaldi] 66420: [D3DRM] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: akhaldi Date: Mon Feb 23 11:03:25 2015 New Revision: 66420 URL: http://svn.reactos.org/svn/reactos?rev=66420&view=rev Log: [D3DRM] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm.c trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/d3drm.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/d3drm.c [iso-8859-1] Mon Feb 23 11:03:25 2015 @@ -1229,17 +1229,16 @@ /* Cannot be requested */ if (parent_frame) { - D3DRMMATRIX4D matrix; + D3DRMMATRIX4D *matrix; DWORD size; TRACE("Load Frame Transform Matrix data\n"); - size = sizeof(matrix); - hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)matrix); + hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)&matrix); if ((hr != DXFILE_OK) || (size != sizeof(matrix))) goto end; - hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, matrix); + hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, *matrix); if (FAILED(hr)) goto end; } Modified: trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/mes… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c [iso-8859-1] Mon Feb 23 11:03:25 2015 @@ -1065,7 +1065,6 @@ This->nb_vertices = *(DWORD*)ptr; This->nb_faces = *(DWORD*)(ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR)); faces_vertex_idx_size = size - sizeof(DWORD) - This->nb_vertices * sizeof(D3DVECTOR) - sizeof(DWORD); - faces_vertex_idx_ptr = (DWORD*)(ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR) + sizeof(DWORD)); TRACE("Mesh: nb_vertices = %d, nb_faces = %d, faces_vertex_idx_size = %d\n", This->nb_vertices, This->nb_faces, faces_vertex_idx_size); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Feb 23 11:03:25 2015 @@ -31,7 +31,7 @@ reactos/dll/directx/wine/d3d8 # Synced to Wine-1.7.27 reactos/dll/directx/wine/d3d9 # Synced to Wine-1.7.27 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.37 -reactos/dll/directx/wine/d3drm # Synced to Wine-1.7.27 +reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.27 reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.27 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.27

1 0

[hbelusca] 66419: [NTOS]: Recenter the logos on screen and improve few of them.
by hbelusca＠svn.reactos.org 23 Feb '15

23 Feb '15

Author: hbelusca Date: Mon Feb 23 02:42:58 2015 New Revision: 66419 URL: http://svn.reactos.org/svn/reactos?rev=66419&view=rev Log: [NTOS]: Recenter the logos on screen and improve few of them. Modified: trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/inbv/logo/1.bmp trunk/reactos/ntoskrnl/inbv/logo/2.bmp trunk/reactos/ntoskrnl/inbv/logo/3.bmp trunk/reactos/ntoskrnl/po/poshtdwn.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Mon Feb 23 02:42:58 2015 @@ -777,8 +777,8 @@ TempRotBarSelection = RB_SQUARE_CELLS; /* - * Save the main image palette and replace it with black palette, so - * we can do fade in effect later. + * Save the main image palette and replace it with black palette, + * so that we can do fade in effect later. */ BitmapInfoHeader = (PBITMAPINFOHEADER)Screen; Palette = (LPRGBQUAD)((PUCHAR)Screen + BitmapInfoHeader->biSize); @@ -789,7 +789,7 @@ InbvBitBlt(Screen, 0, 0); /* Set progress bar coordinates and display it */ - InbvSetProgressBarCoordinates(257, 352); + InbvSetProgressBarCoordinates(259, 352); /* Display the boot logo and fade it in */ BootImageFadeIn(); Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/2.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/inbv/logo/3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/3.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Mon Feb 23 02:42:58 2015 @@ -168,8 +168,8 @@ Logo2 = InbvGetResourceAddress(IDB_LOGO); if ((Logo1) && (Logo2)) { - InbvBitBlt(Logo1, 215, 352); - InbvBitBlt(Logo2, 217, 111); + InbvBitBlt(Logo1, 220, 352); + InbvBitBlt(Logo2, 222, 111); } } else

1 0

[gadamopoulos] 66418: [COMCTL32] - Implement ILS_SATURATE in our image list implementation - Use ILS_SATURATE when showing icons of disabled buttons in the toolbar Patch Ismael Ferreras Morezuelas ...
by gadamopoulos＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: gadamopoulos Date: Sun Feb 22 20:59:08 2015 New Revision: 66418 URL: http://svn.reactos.org/svn/reactos?rev=66418&view=rev Log: [COMCTL32] - Implement ILS_SATURATE in our image list implementation - Use ILS_SATURATE when showing icons of disabled buttons in the toolbar Patch Ismael Ferreras Morezuelas aka swyter CORE-8916 Modified: trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Sun Feb 22 20:59:08 2015 @@ -33,7 +33,7 @@ * * TODO: * - Add support for ILD_PRESERVEALPHA, ILD_SCALE, ILD_DPISCALE - * - Add support for ILS_GLOW, ILS_SHADOW, ILS_SATURATE + * - Add support for ILS_GLOW, ILS_SHADOW * - Thread-safe locking */ @@ -1227,7 +1227,7 @@ } -static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, +static BOOL alpha_blend_image( HIMAGELIST himl, HDC srce_dc, HDC dest_dc, int dest_x, int dest_y, int src_x, int src_y, int cx, int cy, BLENDFUNCTION func, UINT style, COLORREF blend_col ) { @@ -1252,9 +1252,9 @@ info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - if (!(bmp = CreateDIBSection( himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; + if (!(bmp = CreateDIBSection( srce_dc, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; SelectObject( hdc, bmp ); - BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); + BitBlt( hdc, 0, 0, cx, cy, srce_dc, src_x, src_y, SRCCOPY ); if (blend_col != CLR_NONE) { @@ -1327,6 +1327,66 @@ return ret; } +HDC saturate_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, + int src_x, int src_y, int cx, int cy, COLORREF rgbFg) +{ + HDC hdc = NULL; + HBITMAP bmp = 0; + BITMAPINFO *info; + + unsigned int *ptr; + void *bits; + int i; + + /* create a dc and its device independent bitmap for doing the work, + shamelessly copied from the alpha-blending function above */ + if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = cx; + info->bmiHeader.biHeight = cy; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = cx * cy * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (!(bmp = CreateDIBSection(himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; + + /* bind both surfaces */ + SelectObject(hdc, bmp); + + /* copy into our dc the section that covers just the icon we we're asked for */ + BitBlt(hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY); + + /* loop every pixel of the bitmap */ + for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) + { + COLORREF orig_color = *ptr; + + /* calculate the effective luminance using the constants from here, adapted to the human eye: + <http://bobpowell.net/grayscale.aspx> */ + float mixed_color = (GetRValue(orig_color) * .30 + + GetGValue(orig_color) * .59 + + GetBValue(orig_color) * .11); + + *ptr = RGBA(mixed_color, mixed_color, mixed_color, GetAValue(orig_color)); + } + +done: + + if (bmp) + DeleteObject(bmp); + + if (info) + HeapFree(GetProcessHeap(), 0, info); + + /* return the handle to our desaturated dc, that will substitute its original counterpart in the next calls */ + return hdc; +} + /************************************************************************* * ImageList_DrawIndirect [COMCTL32.@] * @@ -1403,6 +1463,21 @@ oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) ); oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); + /* + * If the ILS_SATURATE bit is enabled we should multiply the + * RGB colors of the original image by the contents of rgbFg. + */ + if (fState & ILS_SATURATE) + { + hImageListDC = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y, + pt.x, pt.y, cx, cy, pimldp->rgbFg); + + /* shitty way of getting subroutines to blit at the right place (top left corner), + as our modified imagelist only contains a single image for performance reasons */ + pt.x = 0; + pt.y = 0; + } + has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); if (!bMask && (has_alpha || (fState & ILS_ALPHA))) { @@ -1423,7 +1498,7 @@ if (bIsTransparent) { - bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, + bResult = alpha_blend_image( himl, hImageListDC, pimldp->hdcDst, pimldp->x, pimldp->y, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); goto end; } @@ -1433,7 +1508,7 @@ hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); + alpha_blend_image( himl, hImageListDC, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end; @@ -1527,7 +1602,6 @@ } } - if (fState & ILS_SATURATE) FIXME("ILS_SATURATE: unimplemented!\n"); if (fState & ILS_GLOW) FIXME("ILS_GLOW: unimplemented!\n"); if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n"); Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sun Feb 22 20:59:08 2015 @@ -696,10 +696,12 @@ const NMTBCUSTOMDRAW *tbcd, DWORD dwItemCDFlag) { HIMAGELIST himl = NULL; - BOOL draw_masked = FALSE; + BOOL draw_masked = FALSE, draw_desaturated = FALSE; INT index; INT offset = 0; UINT draw_flags = ILD_TRANSPARENT; + IMAGEINFO info = {0}; + BITMAP bm = {0}; if (tbcd->nmcd.uItemState & (CDIS_DISABLED | CDIS_INDETERMINATE)) { @@ -707,7 +709,18 @@ if (!himl) { himl = TOOLBAR_GetImageListForDrawing(infoPtr, btnPtr, IMAGE_LIST_DEFAULT, &index); - draw_masked = TRUE; + + ImageList_GetImageInfo(himl, index, &info); + GetObjectW(info.hbmImage, sizeof(bm), &bm); + + if (bm.bmBitsPixel == 32) + { + draw_desaturated = TRUE; + } + else + { + draw_masked = TRUE; + } } } else if (tbcd->nmcd.uItemState & CDIS_CHECKED || @@ -738,9 +751,34 @@ index, himl, left, top, offset); if (draw_masked) + { + /* code path for drawing flat disabled icons without alpha channel */ TOOLBAR_DrawMasked (himl, index, tbcd->nmcd.hdc, left + offset, top + offset, draw_flags); + } + else if (draw_desaturated) + { + /* code path for drawing disabled, alpha-blended (32bpp) icons */ + IMAGELISTDRAWPARAMS imldp = {0}; + + imldp.cbSize = sizeof(imldp); + imldp.himl = himl; + imldp.i = index; + imldp.hdcDst = tbcd->nmcd.hdc, + imldp.x = offset + left; + imldp.y = offset + top; + imldp.rgbBk = CLR_NONE; + imldp.rgbFg = CLR_DEFAULT; + imldp.fStyle = ILD_TRANSPARENT; + imldp.fState = ILS_ALPHA | ILS_SATURATE; + imldp.Frame = 192; + + ImageList_DrawIndirect (&imldp); + } else + { + /* code path for drawing standard icons as-is */ ImageList_Draw (himl, index, tbcd->nmcd.hdc, left + offset, top + offset, draw_flags); + } } /* draws a blank frame for a toolbar button */ Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sun Feb 22 20:59:08 2015 @@ -2902,8 +2902,10 @@ #define GetRValue(rgb) ((BYTE)(rgb)) #define GetGValue(rgb) ((BYTE)(((WORD)(rgb)) >> 8)) #define GetBValue(rgb) ((BYTE)((rgb)>>16)) +#define GetAValue(rgb) ((BYTE)((rgb)>>24)) #define RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16))) +#define RGBA(r,g,b,a) ((COLORREF)((((DWORD)(BYTE)(a))<<24) | RGB(r,g,b))) #define PALETTERGB(r,g,b) (0x02000000 | RGB(r,g,b)) #define PALETTEINDEX(i) ((COLORREF)(0x01000000 | (DWORD)(WORD)(i)))

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015