Ros-diffs December 2022

ros-diffs@reactos.org

19 participants
98 discussions

[reactos] 01/01: [WIN32K:NTGDI] PATH_PathToRegion(): Update documentation (#4941)
by Serge Gautherie 22 Dec '22

22 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8efde69a25ec7c2d12238… commit 8efde69a25ec7c2d12238e78e1908d1df2b5c582 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Dec 22 01:27:51 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 22 01:27:51 2022 +0100 [WIN32K:NTGDI] PATH_PathToRegion(): Update documentation (#4941) Addendum to 215e0d9 (r64177). --- win32ss/gdi/ntgdi/path.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/win32ss/gdi/ntgdi/path.c b/win32ss/gdi/ntgdi/path.c index 08ca767473d..a8e58500938 100644 --- a/win32ss/gdi/ntgdi/path.c +++ b/win32ss/gdi/ntgdi/path.c @@ -1442,9 +1442,8 @@ PATH_FlattenPath(PPATH pPath) /* PATH_PathToRegion * - * Creates a region from the specified path using the specified polygon - * filling mode. The path is left unchanged. A handle to the region that - * was created is stored in *pHrgn. + * Fills Rgn from the specified path using the specified polygon + * filling mode. The path is left unchanged. */ BOOL FASTCALL

1 0

[reactos] 01/01: [NTOBJSHEX] Fix displayed registry value type and icon (#4949)
by Serge Gautherie 21 Dec '22

21 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b6775505ad2463362072… commit 0b6775505ad24633620725513273ba550afb1962 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Dec 21 13:42:36 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 21 15:42:36 2022 +0300 [NTOBJSHEX] Fix displayed registry value type and icon (#4949) - RegistryTypeNames[]: Remove an unwanted space - CRegistryFolderExtractIcon::GetIconLocation(): Add the REG_ENTRY_VALUE_WITH_CONTENT case - CRegistryFolder::GetDetailsOf(): Fix copypasta - CRegistryFolder::FormatValueData(): Fix magic constant CORE-18747 --- dll/shellext/ntobjshex/ntobjenum.cpp | 2 +- dll/shellext/ntobjshex/regfolder.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/shellext/ntobjshex/ntobjenum.cpp b/dll/shellext/ntobjshex/ntobjenum.cpp index 62d1b1940b7..1d2c6c5f690 100644 --- a/dll/shellext/ntobjshex/ntobjenum.cpp +++ b/dll/shellext/ntobjshex/ntobjenum.cpp @@ -43,7 +43,7 @@ const LPCWSTR RegistryTypeNames [] = { L"REG_MULTI_SZ", L"REG_RESOURCE_LIST", L"REG_FULL_RESOURCE_DESCRIPTOR", - L"REG_RESOURCE_REQUIREMENTS_LIST ", + L"REG_RESOURCE_REQUIREMENTS_LIST", L"REG_QWORD" }; diff --git a/dll/shellext/ntobjshex/regfolder.cpp b/dll/shellext/ntobjshex/regfolder.cpp index e8369f8d24c..83683f05171 100644 --- a/dll/shellext/ntobjshex/regfolder.cpp +++ b/dll/shellext/ntobjshex/regfolder.cpp @@ -71,6 +71,7 @@ HRESULT STDMETHODCALLTYPE CRegistryFolderExtractIcon::GetIconLocation( return S_OK; case REG_ENTRY_VALUE: + case REG_ENTRY_VALUE_WITH_CONTENT: GetModuleFileNameW(g_hInstance, szIconFile, cchMax); *piIndex = -IDI_REGISTRYVALUE; *pwFlags = flags; @@ -299,7 +300,7 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::GetDetailsOf( return MakeStrRetFromString(L"Key", &(psd->str)); } - return MakeStrRetFromString(RegistryTypeNames[info->entryType], &(psd->str)); + return MakeStrRetFromString(RegistryTypeNames[info->contentType], &(psd->str)); } case REGISTRY_COLUMN_VALUE: @@ -490,7 +491,7 @@ HRESULT CRegistryFolder::FormatValueData(DWORD contentType, PVOID td, DWORD cont { switch (contentType) { - case 0: + case REG_NONE: { PCWSTR strTodo = L""; DWORD bufferLength = (wcslen(strTodo) + 1) * sizeof(WCHAR);

1 0

[reactos] 01/01: [NTOBJSHEX] Fix sorting elements by different columns (#4947)
by Egor Ananyin 20 Dec '22

20 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0248f4f5198f3d8ed179… commit e0248f4f5198f3d8ed17956da32da09afb36003d Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Tue Dec 20 23:58:30 2022 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 20 23:58:30 2022 +0300 [NTOBJSHEX] Fix sorting elements by different columns (#4947) - Add ability to sort NT objects by symlinks - Add ability to sort registry entries by type/value CORE-18761 CORE-18762 --- dll/shellext/ntobjshex/ntobjfolder.cpp | 23 ++++++++++++++++++++-- dll/shellext/ntobjshex/regfolder.cpp | 35 +++++++++++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dll/shellext/ntobjshex/ntobjfolder.cpp b/dll/shellext/ntobjshex/ntobjfolder.cpp index 020dcc35bfe..f4aef063103 100644 --- a/dll/shellext/ntobjshex/ntobjfolder.cpp +++ b/dll/shellext/ntobjshex/ntobjfolder.cpp @@ -463,8 +463,27 @@ HRESULT CNtObjectFolder::CompareIDs(LPARAM lParam, const NtPidlEntry * first, co return MAKE_COMPARE_HRESULT(second->objectType - first->objectType); case NTOBJECT_COLUMN_LINKTARGET: - // Can't sort by link target yet - return E_INVALIDARG; + { + if (first->objectType != SYMBOLICLINK_OBJECT && second->objectType != SYMBOLICLINK_OBJECT) + return CompareName(lParam, first, second); + + if (first->objectType != SYMBOLICLINK_OBJECT || second->objectType != SYMBOLICLINK_OBJECT) + return first->objectType != SYMBOLICLINK_OBJECT ? S_GREATERTHAN : S_LESSTHAN; + + WCHAR wbLink1[MAX_PATH] = { 0 }, wbLink2[MAX_PATH] = { 0 }; + UNICODE_STRING firstLink, secondLink; + RtlInitEmptyUnicodeString(&firstLink, wbLink1, sizeof(wbLink1)); + + if (FAILED_UNEXPECTEDLY(GetNTObjectSymbolicLinkTarget(m_NtPath, first->entryName, &firstLink))) + return E_INVALIDARG; + + RtlInitEmptyUnicodeString(&secondLink, wbLink2, sizeof(wbLink2)); + + if (FAILED_UNEXPECTEDLY(GetNTObjectSymbolicLinkTarget(m_NtPath, second->entryName, &secondLink))) + return E_INVALIDARG; + + return MAKE_COMPARE_HRESULT(RtlCompareUnicodeString(&firstLink, &secondLink, TRUE)); + } } DbgPrint("Unsupported sorting mode.\n"); diff --git a/dll/shellext/ntobjshex/regfolder.cpp b/dll/shellext/ntobjshex/regfolder.cpp index 685a40cf866..e8369f8d24c 100644 --- a/dll/shellext/ntobjshex/regfolder.cpp +++ b/dll/shellext/ntobjshex/regfolder.cpp @@ -409,11 +409,40 @@ HRESULT CRegistryFolder::CompareIDs(LPARAM lParam, const RegPidlEntry * first, c return CompareName(lParam, first, second); case REGISTRY_COLUMN_TYPE: - return MAKE_COMPARE_HRESULT(second->contentType - first->contentType); + { + if (first->entryType != second->entryType) + return MAKE_COMPARE_HRESULT(second->entryType - first->entryType); + + if (first->entryType == REG_ENTRY_KEY) + { + if (first->contentsLength == 0 || second->contentsLength == 0) + return (first->contentsLength == 0) ? S_GREATERTHAN : S_LESSTHAN; + + PWSTR firstKey = (PWSTR)(((PBYTE)first) + FIELD_OFFSET(RegPidlEntry, entryName) + first->entryNameLength + sizeof(WCHAR)); + PWSTR secondKey = (PWSTR)(((PBYTE)second) + FIELD_OFFSET(RegPidlEntry, entryName) + second->entryNameLength + sizeof(WCHAR)); + return MAKE_COMPARE_HRESULT(lstrcmpW(firstKey, secondKey)); + } + + return CompareName(lParam, first, second); + } case REGISTRY_COLUMN_VALUE: - // Can't sort by link target yet - return E_INVALIDARG; + { + PCWSTR firstContent, secondContent; + + if (FAILED_UNEXPECTEDLY(FormatContentsForDisplay(first, m_hRoot, m_NtPath, &firstContent))) + return E_INVALIDARG; + + if (FAILED_UNEXPECTEDLY(FormatContentsForDisplay(second, m_hRoot, m_NtPath, &secondContent))) + return E_INVALIDARG; + + hr = MAKE_COMPARE_HRESULT(lstrcmpW(firstContent, secondContent)); + + CoTaskMemFree((LPVOID)firstContent); + CoTaskMemFree((LPVOID)secondContent); + + return hr; + } } DbgPrint("Unsupported sorting mode.\n");

1 0

[reactos] 01/01: [SHELL32] Read the label for a CD from autorun.inf (#4945)
by Egor Ananyin 20 Dec '22

20 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1718366de0986b9d00fc… commit d1718366de0986b9d00fc36ace32fa32f99de444 Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Tue Dec 20 22:30:09 2022 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 20 22:30:09 2022 +0300 [SHELL32] Read the label for a CD from autorun.inf (#4945) Some CDs may set a custom label using autorun.inf. Read the label from the file, and if it succeeds, show it to the user. CORE-18567 --- dll/win32/shell32/folders/CDrivesFolder.cpp | 84 +++++++++++++++++++---------- 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 565c1dc6052..16b6b701f5b 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -463,6 +463,28 @@ getIconLocationForDrive(IShellFolder *psf, PCITEMID_CHILD pidl, UINT uFlags, return E_FAIL; } +static HRESULT +getLabelForDrive(LPWSTR wszPath, LPWSTR wszLabel) +{ + WCHAR wszAutoRunInfPath[MAX_PATH]; + WCHAR wszTemp[MAX_PATH]; + + if (!PathIsDirectoryW(wszPath)) + return E_FAIL; + + StringCchCopyW(wszAutoRunInfPath, _countof(wszAutoRunInfPath), wszPath); + PathAppendW(wszAutoRunInfPath, L"autorun.inf"); + + if (GetPrivateProfileStringW(L"autorun", L"label", NULL, wszTemp, _countof(wszTemp), + wszAutoRunInfPath) && wszTemp[0] != 0) + { + StringCchCopyW(wszLabel, _countof(wszTemp), wszTemp); + return S_OK; + } + + return E_FAIL; +} + BOOL IsDriveFloppyA(LPCSTR pszDriveRoot); HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) @@ -979,38 +1001,46 @@ HRESULT WINAPI CDrivesFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFla if (!(dwFlags & SHGDN_FORPARSING)) { WCHAR wszDrive[18] = {0}; - DWORD dwVolumeSerialNumber, dwMaximumComponentLength, dwFileSystemFlags; lstrcpynW(wszDrive, pszPath, 4); pszPath[0] = L'\0'; - GetVolumeInformationW(wszDrive, pszPath, - MAX_PATH - 7, - &dwVolumeSerialNumber, - &dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0); - pszPath[MAX_PATH-1] = L'\0'; - if (!wcslen(pszPath)) + + if (!SUCCEEDED(getLabelForDrive(wszDrive, pszPath))) { - UINT DriveType, ResourceId; - DriveType = GetDriveTypeW(wszDrive); - switch(DriveType) - { - case DRIVE_FIXED: - ResourceId = IDS_DRIVE_FIXED; - break; - case DRIVE_REMOTE: - ResourceId = IDS_DRIVE_NETWORK; - break; - case DRIVE_CDROM: - ResourceId = IDS_DRIVE_CDROM; - break; - default: - ResourceId = 0; - } - if (ResourceId) + DWORD dwVolumeSerialNumber, dwMaximumComponentLength, dwFileSystemFlags; + + GetVolumeInformationW(wszDrive, pszPath, + MAX_PATH - 7, + &dwVolumeSerialNumber, + &dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0); + pszPath[MAX_PATH-1] = L'\0'; + + if (!wcslen(pszPath)) { - dwFileSystemFlags = LoadStringW(shell32_hInstance, ResourceId, pszPath, MAX_PATH); - if (dwFileSystemFlags > MAX_PATH - 7) - pszPath[MAX_PATH-7] = L'\0'; + UINT DriveType, ResourceId; + DriveType = GetDriveTypeW(wszDrive); + + switch (DriveType) + { + case DRIVE_FIXED: + ResourceId = IDS_DRIVE_FIXED; + break; + case DRIVE_REMOTE: + ResourceId = IDS_DRIVE_NETWORK; + break; + case DRIVE_CDROM: + ResourceId = IDS_DRIVE_CDROM; + break; + default: + ResourceId = 0; + } + + if (ResourceId) + { + dwFileSystemFlags = LoadStringW(shell32_hInstance, ResourceId, pszPath, MAX_PATH); + if (dwFileSystemFlags > MAX_PATH - 7) + pszPath[MAX_PATH-7] = L'\0'; + } } } wcscat (pszPath, L" (");

1 0

[reactos] 01/01: [NTOBJSHEX] Formatting only
by Stanislav Motylkov 20 Dec '22

20 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba03ffd645520be066ab9… commit ba03ffd645520be066ab91f690fe6b840c424ee6 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Dec 20 20:08:08 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Dec 20 20:08:08 2022 +0300 [NTOBJSHEX] Formatting only --- dll/shellext/ntobjshex/foldercommon.cpp | 9 +- dll/shellext/ntobjshex/foldercommon.h | 47 ++-- dll/shellext/ntobjshex/ntobjenum.cpp | 47 ++-- dll/shellext/ntobjshex/ntobjenum.h | 22 +- dll/shellext/ntobjshex/ntobjfolder.cpp | 231 ++++++++++--------- dll/shellext/ntobjshex/ntobjfolder.h | 12 +- dll/shellext/ntobjshex/ntobjshex.cpp | 9 +- dll/shellext/ntobjshex/regfolder.cpp | 381 +++++++++++++++++--------------- dll/shellext/ntobjshex/regfolder.h | 10 +- 9 files changed, 391 insertions(+), 377 deletions(-) diff --git a/dll/shellext/ntobjshex/foldercommon.cpp b/dll/shellext/ntobjshex/foldercommon.cpp index b67e01edb23..d5050cd5883 100644 --- a/dll/shellext/ntobjshex/foldercommon.cpp +++ b/dll/shellext/ntobjshex/foldercommon.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS shell extensions - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/shellext/ntobjshex/ntobjfolder.cpp - * PURPOSE: NT Object Namespace shell extension - * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> + * PROJECT: NT Object Namespace shell extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Folder view class placeholder file + * COPYRIGHT: Copyright 2015-2017 David Quintana <gigaherz(a)gmail.com> */ #include "precomp.h" diff --git a/dll/shellext/ntobjshex/foldercommon.h b/dll/shellext/ntobjshex/foldercommon.h index 3a6b472ce8c..2983f328198 100644 --- a/dll/shellext/ntobjshex/foldercommon.h +++ b/dll/shellext/ntobjshex/foldercommon.h @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS shell extensions - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/shellext/ntobjshex/ntobjfolder.h - * PURPOSE: NT Object Namespace shell extension - * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> + * PROJECT: NT Object Namespace shell extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Folder view class header and implementation + * COPYRIGHT: Copyright 2015-2017 David Quintana <gigaherz(a)gmail.com> */ + #pragma once extern const GUID CLSID_NtObjectFolder; @@ -24,16 +24,18 @@ public: { switch (uMsg) { - case SFVM_DEFVIEWMODE: - { - FOLDERVIEWMODE* pViewMode = (FOLDERVIEWMODE*)lParam; - *pViewMode = FVM_DETAILS; - return S_OK; - } - case SFVM_COLUMNCLICK: - return S_FALSE; - case SFVM_BACKGROUNDENUM: - return S_OK; + case SFVM_DEFVIEWMODE: + { + FOLDERVIEWMODE* pViewMode = (FOLDERVIEWMODE*)lParam; + *pViewMode = FVM_DETAILS; + return S_OK; + } + + case SFVM_COLUMNCLICK: + return S_FALSE; + + case SFVM_BACKGROUNDENUM: + return S_OK; } DbgPrint("MessageSFVCB unimplemented %d %08x %08x\n", uMsg, wParam, lParam); @@ -697,12 +699,13 @@ public: { switch (uMsg) { - case DFM_MERGECONTEXTMENU: - return S_OK; - case DFM_INVOKECOMMAND: - case DFM_INVOKECOMMANDEX: - case DFM_GETDEFSTATICID: // Required for Windows 7 to pick a default - return S_FALSE; + case DFM_MERGECONTEXTMENU: + return S_OK; + + case DFM_INVOKECOMMAND: + case DFM_INVOKECOMMANDEX: + case DFM_GETDEFSTATICID: // Required for Windows 7 to pick a default + return S_FALSE; } return E_NOTIMPL; } @@ -718,4 +721,4 @@ public: COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) END_COM_MAP() -}; \ No newline at end of file +}; diff --git a/dll/shellext/ntobjshex/ntobjenum.cpp b/dll/shellext/ntobjshex/ntobjenum.cpp index 80ae5da6900..62d1b1940b7 100644 --- a/dll/shellext/ntobjshex/ntobjenum.cpp +++ b/dll/shellext/ntobjshex/ntobjenum.cpp @@ -1,19 +1,8 @@ /* - * Copyright 2004, 2005 Martin Fuchs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: NT Object Namespace shell extension + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: NT Object Namespace enumeration functions + * COPYRIGHT: Copyright 2004-2005 Martin Fuchs <martin-fuchs(a)gmx.net> */ #include "precomp.h" @@ -73,19 +62,19 @@ static DWORD NtOpenObject(OBJECT_TYPE type, PHANDLE phandle, DWORD access, LPCWS switch (type) { - case DIRECTORY_OBJECT: return NtOpenDirectoryObject(phandle, access, &open_struct); - case SYMBOLICLINK_OBJECT: return NtOpenSymbolicLinkObject(phandle, access, &open_struct); - case MUTANT_OBJECT: return NtOpenMutant(phandle, access, &open_struct); - case SECTION_OBJECT: return NtOpenSection(phandle, access, &open_struct); - case EVENT_OBJECT: return NtOpenEvent(phandle, access, &open_struct); - case SEMAPHORE_OBJECT: return NtOpenSemaphore(phandle, access, &open_struct); - case TIMER_OBJECT: return NtOpenTimer(phandle, access, &open_struct); - case KEY_OBJECT: return NtOpenKey(phandle, access, &open_struct); - case EVENTPAIR_OBJECT: return NtOpenEventPair(phandle, access, &open_struct); - case IOCOMPLETION_OBJECT: return NtOpenIoCompletion(phandle, access, &open_struct); - case FILE_OBJECT: return NtOpenFile(phandle, access, &open_struct, &ioStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0); - default: - return ERROR_INVALID_FUNCTION; + case DIRECTORY_OBJECT: return NtOpenDirectoryObject(phandle, access, &open_struct); + case SYMBOLICLINK_OBJECT: return NtOpenSymbolicLinkObject(phandle, access, &open_struct); + case MUTANT_OBJECT: return NtOpenMutant(phandle, access, &open_struct); + case SECTION_OBJECT: return NtOpenSection(phandle, access, &open_struct); + case EVENT_OBJECT: return NtOpenEvent(phandle, access, &open_struct); + case SEMAPHORE_OBJECT: return NtOpenSemaphore(phandle, access, &open_struct); + case TIMER_OBJECT: return NtOpenTimer(phandle, access, &open_struct); + case KEY_OBJECT: return NtOpenKey(phandle, access, &open_struct); + case EVENTPAIR_OBJECT: return NtOpenEventPair(phandle, access, &open_struct); + case IOCOMPLETION_OBJECT: return NtOpenIoCompletion(phandle, access, &open_struct); + case FILE_OBJECT: return NtOpenFile(phandle, access, &open_struct, &ioStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0); + default: + return ERROR_INVALID_FUNCTION; } } @@ -748,4 +737,4 @@ HRESULT GetEnumRegistryKey(LPCWSTR path, HKEY root, IEnumIDList ** ppil) HRESULT GetEnumNTDirectory(LPCWSTR path, IEnumIDList ** ppil) { return ShellObjectCreatorInit<CEnumNTDirectory>(path, IID_PPV_ARG(IEnumIDList, ppil)); -} \ No newline at end of file +} diff --git a/dll/shellext/ntobjshex/ntobjenum.h b/dll/shellext/ntobjshex/ntobjenum.h index 2f683696006..b277f94bce4 100644 --- a/dll/shellext/ntobjshex/ntobjenum.h +++ b/dll/shellext/ntobjshex/ntobjenum.h @@ -1,20 +1,10 @@ /* - * Copyright 2004 Martin Fuchs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: NT Object Namespace shell extension + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: NT Object Namespace enumeration header + * COPYRIGHT: Copyright 2004 Martin Fuchs <martin-fuchs(a)gmx.net> */ + #pragma once @@ -100,4 +90,4 @@ HRESULT GetEnumRegistryRoot(IEnumIDList ** ppil); HRESULT GetEnumRegistryKey(LPCWSTR path, HKEY root, IEnumIDList ** ppil); HRESULT GetEnumNTDirectory(LPCWSTR path, IEnumIDList ** ppil); -HRESULT GetNTObjectSymbolicLinkTarget(LPCWSTR path, LPCWSTR entryName, PUNICODE_STRING LinkTarget); \ No newline at end of file +HRESULT GetNTObjectSymbolicLinkTarget(LPCWSTR path, LPCWSTR entryName, PUNICODE_STRING LinkTarget); diff --git a/dll/shellext/ntobjshex/ntobjfolder.cpp b/dll/shellext/ntobjshex/ntobjfolder.cpp index 056bf67ca87..020dcc35bfe 100644 --- a/dll/shellext/ntobjshex/ntobjfolder.cpp +++ b/dll/shellext/ntobjshex/ntobjfolder.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS shell extensions - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/shellext/ntobjshex/ntobjfolder.cpp - * PURPOSE: NT Object Namespace shell extension - * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> + * PROJECT: NT Object Namespace shell extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: NT Object Namespace folder class implementation + * COPYRIGHT: Copyright 2015-2017 David Quintana <gigaherz(a)gmail.com> */ #include "precomp.h" @@ -62,32 +61,36 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolderExtractIcon::GetIconLocation( switch (entry->objectType) { - case DIRECTORY_OBJECT: - case SYMBOLICLINK_OBJECT: - GetModuleFileNameW(g_hInstance, szIconFile, cchMax); - *piIndex = -((uFlags & GIL_OPENICON) ? IDI_NTOBJECTDIROPEN : IDI_NTOBJECTDIR); - *pwFlags = flags; - return S_OK; - case DEVICE_OBJECT: - GetModuleFileNameW(g_hInstance, szIconFile, cchMax); - *piIndex = -IDI_NTOBJECTDEVICE; - *pwFlags = flags; - return S_OK; - case PORT_OBJECT: - GetModuleFileNameW(g_hInstance, szIconFile, cchMax); - *piIndex = -IDI_NTOBJECTPORT; - *pwFlags = flags; - return S_OK; - case KEY_OBJECT: - GetModuleFileNameW(g_hInstance, szIconFile, cchMax); - *piIndex = -IDI_REGISTRYKEY; - *pwFlags = flags; - return S_OK; - default: - GetModuleFileNameW(g_hInstance, szIconFile, cchMax); - *piIndex = -IDI_NTOBJECTITEM; - *pwFlags = flags; - return S_OK; + case DIRECTORY_OBJECT: + case SYMBOLICLINK_OBJECT: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -((uFlags & GIL_OPENICON) ? IDI_NTOBJECTDIROPEN : IDI_NTOBJECTDIR); + *pwFlags = flags; + return S_OK; + + case DEVICE_OBJECT: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_NTOBJECTDEVICE; + *pwFlags = flags; + return S_OK; + + case PORT_OBJECT: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_NTOBJECTPORT; + *pwFlags = flags; + return S_OK; + + case KEY_OBJECT: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_REGISTRYKEY; + *pwFlags = flags; + return S_OK; + + default: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_NTOBJECTITEM; + *pwFlags = flags; + return S_OK; } } @@ -223,15 +226,17 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetDefaultColumnState( { switch (iColumn) { - case NTOBJECT_COLUMN_NAME: - *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT; - return S_OK; - case NTOBJECT_COLUMN_TYPE: - *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT; - return S_OK; - case NTOBJECT_COLUMN_LINKTARGET: - *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT | SHCOLSTATE_SLOW; - return S_OK; + case NTOBJECT_COLUMN_NAME: + *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT; + return S_OK; + + case NTOBJECT_COLUMN_TYPE: + *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT; + return S_OK; + + case NTOBJECT_COLUMN_LINKTARGET: + *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT | SHCOLSTATE_SLOW; + return S_OK; } return E_INVALIDARG; @@ -321,75 +326,83 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetDetailsOf( switch (iColumn) { - case NTOBJECT_COLUMN_NAME: - psd->fmt = LVCFMT_LEFT; + case NTOBJECT_COLUMN_NAME: + { + psd->fmt = LVCFMT_LEFT; - MakeStrRetFromString(info->entryName, info->entryNameLength, &(psd->str)); - return S_OK; - case NTOBJECT_COLUMN_TYPE: - psd->fmt = LVCFMT_LEFT; + MakeStrRetFromString(info->entryName, info->entryNameLength, &(psd->str)); + return S_OK; + } - if (info->objectType < 0) + case NTOBJECT_COLUMN_TYPE: { - NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); + psd->fmt = LVCFMT_LEFT; + + if (info->objectType < 0) + { + NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); - if (td->typeNameLength > 0) - MakeStrRetFromString(td->typeName, td->typeNameLength, &(psd->str)); + if (td->typeNameLength > 0) + MakeStrRetFromString(td->typeName, td->typeNameLength, &(psd->str)); + else + MakeStrRetFromString(L"Unknown", &(psd->str)); + } else - MakeStrRetFromString(L"Unknown", &(psd->str)); + MakeStrRetFromString(ObjectTypeNames[info->objectType], &(psd->str)); + return S_OK; } - else - MakeStrRetFromString(ObjectTypeNames[info->objectType], &(psd->str)); - return S_OK; - case NTOBJECT_COLUMN_LINKTARGET: - { - psd->fmt = LVCFMT_LEFT; - if (info->objectType == SYMBOLICLINK_OBJECT) + case NTOBJECT_COLUMN_LINKTARGET: { - WCHAR wbLink[MAX_PATH] = { 0 }; - UNICODE_STRING link; - RtlInitEmptyUnicodeString(&link, wbLink, sizeof(wbLink)); - - HRESULT hr = GetNTObjectSymbolicLinkTarget(m_NtPath, info->entryName, &link); + psd->fmt = LVCFMT_LEFT; - if (!FAILED_UNEXPECTEDLY(hr) && link.Length > 0) + if (info->objectType == SYMBOLICLINK_OBJECT) { - MakeStrRetFromString(link.Buffer, link.Length, &(psd->str)); - return S_OK; + WCHAR wbLink[MAX_PATH] = { 0 }; + UNICODE_STRING link; + RtlInitEmptyUnicodeString(&link, wbLink, sizeof(wbLink)); + + HRESULT hr = GetNTObjectSymbolicLinkTarget(m_NtPath, info->entryName, &link); + + if (!FAILED_UNEXPECTEDLY(hr) && link.Length > 0) + { + MakeStrRetFromString(link.Buffer, link.Length, &(psd->str)); + return S_OK; + } } - } - MakeStrRetFromString(L"", &(psd->str)); - return S_OK; - } + MakeStrRetFromString(L"", &(psd->str)); + return S_OK; + } } } else { switch (iColumn) { - case NTOBJECT_COLUMN_NAME: - psd->fmt = LVCFMT_LEFT; - psd->cxChar = 30; + case NTOBJECT_COLUMN_NAME: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 30; - // TODO: Make localizable - MakeStrRetFromString(L"Object Name", &(psd->str)); - return S_OK; - case NTOBJECT_COLUMN_TYPE: - psd->fmt = LVCFMT_LEFT; - psd->cxChar = 20; + // TODO: Make localizable + MakeStrRetFromString(L"Object Name", &(psd->str)); + return S_OK; - // TODO: Make localizable - MakeStrRetFromString(L"Object Type", &(psd->str)); - return S_OK; - case NTOBJECT_COLUMN_LINKTARGET: - psd->fmt = LVCFMT_LEFT; - psd->cxChar = 30; + case NTOBJECT_COLUMN_TYPE: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 20; - // TODO: Make localizable - MakeStrRetFromString(L"Symlink Target", &(psd->str)); - return S_OK; + // TODO: Make localizable + MakeStrRetFromString(L"Object Type", &(psd->str)); + return S_OK; + + case NTOBJECT_COLUMN_LINKTARGET: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 30; + + // TODO: Make localizable + MakeStrRetFromString(L"Symlink Target", &(psd->str)); + return S_OK; } } @@ -403,18 +416,20 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::MapColumnToSCID( static const GUID storage = PSGUID_STORAGE; switch (iColumn) { - case NTOBJECT_COLUMN_NAME: - pscid->fmtid = storage; - pscid->pid = PID_STG_NAME; - return S_OK; - case NTOBJECT_COLUMN_TYPE: - pscid->fmtid = storage; - pscid->pid = PID_STG_STORAGETYPE; - return S_OK; - case NTOBJECT_COLUMN_LINKTARGET: - pscid->fmtid = GUID_NtObjectColumns; - pscid->pid = NTOBJECT_COLUMN_LINKTARGET; - return S_OK; + case NTOBJECT_COLUMN_NAME: + pscid->fmtid = storage; + pscid->pid = PID_STG_NAME; + return S_OK; + + case NTOBJECT_COLUMN_TYPE: + pscid->fmtid = storage; + pscid->pid = PID_STG_STORAGETYPE; + return S_OK; + + case NTOBJECT_COLUMN_LINKTARGET: + pscid->fmtid = GUID_NtObjectColumns; + pscid->pid = NTOBJECT_COLUMN_LINKTARGET; + return S_OK; } return E_INVALIDARG; } @@ -441,15 +456,15 @@ HRESULT CNtObjectFolder::CompareIDs(LPARAM lParam, const NtPidlEntry * first, co switch (column) { - case NTOBJECT_COLUMN_NAME: - return CompareName(lParam, first, second); + case NTOBJECT_COLUMN_NAME: + return CompareName(lParam, first, second); - case NTOBJECT_COLUMN_TYPE: - return MAKE_COMPARE_HRESULT(second->objectType - first->objectType); + case NTOBJECT_COLUMN_TYPE: + return MAKE_COMPARE_HRESULT(second->objectType - first->objectType); - case NTOBJECT_COLUMN_LINKTARGET: - // Can't sort by link target yet - return E_INVALIDARG; + case NTOBJECT_COLUMN_LINKTARGET: + // Can't sort by link target yet + return E_INVALIDARG; } DbgPrint("Unsupported sorting mode.\n"); @@ -498,4 +513,4 @@ HRESULT CNtObjectFolder::GetInfoFromPidl(LPCITEMIDLIST pcidl, const NtPidlEntry *pentry = entry; return S_OK; -} \ No newline at end of file +} diff --git a/dll/shellext/ntobjshex/ntobjfolder.h b/dll/shellext/ntobjshex/ntobjfolder.h index 556ce571528..58e3c09990f 100644 --- a/dll/shellext/ntobjshex/ntobjfolder.h +++ b/dll/shellext/ntobjshex/ntobjfolder.h @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS shell extensions - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/shellext/ntobjshex/ntobjfolder.h - * PURPOSE: NT Object Namespace shell extension - * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> + * PROJECT: NT Object Namespace shell extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: NT Object Namespace folder class header + * COPYRIGHT: Copyright 2015-2017 David Quintana <gigaherz(a)gmail.com> */ + #pragma once extern const GUID CLSID_NtObjectFolder; @@ -113,4 +113,4 @@ protected: HRESULT FormatValueData(DWORD contentType, PVOID td, DWORD contentsLength, PCWSTR * strContents); HRESULT FormatContentsForDisplay(const NtPidlEntry * info, HKEY rootKey, LPCWSTR ntPath, PCWSTR * strContents); -}; \ No newline at end of file +}; diff --git a/dll/shellext/ntobjshex/ntobjshex.cpp b/dll/shellext/ntobjshex/ntobjshex.cpp index a3f2ab20b0e..14e4f7b8821 100644 --- a/dll/shellext/ntobjshex/ntobjshex.cpp +++ b/dll/shellext/ntobjshex/ntobjshex.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS shell extensions - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/shellext/ntobjshex/ntobjshex.cpp - * PURPOSE: NT Object Namespace shell extension - * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> + * PROJECT: NT Object Namespace shell extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Shell extension entry point and exports + * COPYRIGHT: Copyright 2015-2017 David Quintana <gigaherz(a)gmail.com> */ #include "precomp.h" diff --git a/dll/shellext/ntobjshex/regfolder.cpp b/dll/shellext/ntobjshex/regfolder.cpp index 70f1575d513..685a40cf866 100644 --- a/dll/shellext/ntobjshex/regfolder.cpp +++ b/dll/shellext/ntobjshex/regfolder.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS shell extensions - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/shellext/ntobjshex/regfolder.cpp - * PURPOSE: NT Object Namespace shell extension - * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> + * PROJECT: NT Object Namespace shell extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: System Registry folder class implementation + * COPYRIGHT: Copyright 2015-2017 David Quintana <gigaherz(a)gmail.com> */ #include "precomp.h" @@ -64,22 +63,24 @@ HRESULT STDMETHODCALLTYPE CRegistryFolderExtractIcon::GetIconLocation( switch (entry->entryType) { - case REG_ENTRY_KEY: - case REG_ENTRY_ROOT: - 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; + case REG_ENTRY_KEY: + case REG_ENTRY_ROOT: + 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; } } @@ -160,15 +161,17 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::GetDefaultColumnState( { 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; + 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; @@ -264,83 +267,91 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::GetDetailsOf( switch (iColumn) { - case REGISTRY_COLUMN_NAME: - psd->fmt = LVCFMT_LEFT; - - if (info->entryNameLength > 0) + case REGISTRY_COLUMN_NAME: { - return MakeStrRetFromString(info->entryName, info->entryNameLength, &(psd->str)); - } - return MakeStrRetFromString(L"(Default)", &(psd->str)); - - case REGISTRY_COLUMN_TYPE: - psd->fmt = LVCFMT_LEFT; + psd->fmt = LVCFMT_LEFT; - if (info->entryType == REG_ENTRY_ROOT) - { - return MakeStrRetFromString(L"Key", &(psd->str)); + if (info->entryNameLength > 0) + { + return MakeStrRetFromString(info->entryName, info->entryNameLength, &(psd->str)); + } + return MakeStrRetFromString(L"(Default)", &(psd->str)); } - if (info->entryType == REG_ENTRY_KEY) + case REGISTRY_COLUMN_TYPE: { - if (info->contentsLength > 0) + psd->fmt = LVCFMT_LEFT; + + if (info->entryType == REG_ENTRY_ROOT) + { + return MakeStrRetFromString(L"Key", &(psd->str)); + } + + if (info->entryType == REG_ENTRY_KEY) { - PWSTR td = (PWSTR)(((PBYTE)info) + FIELD_OFFSET(RegPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); + if (info->contentsLength > 0) + { + PWSTR td = (PWSTR)(((PBYTE)info) + FIELD_OFFSET(RegPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); + + return MakeStrRetFromString(td, info->contentsLength, &(psd->str)); + } - return MakeStrRetFromString(td, info->contentsLength, &(psd->str)); + return MakeStrRetFromString(L"Key", &(psd->str)); } - return MakeStrRetFromString(L"Key", &(psd->str)); + return MakeStrRetFromString(RegistryTypeNames[info->entryType], &(psd->str)); } - return MakeStrRetFromString(RegistryTypeNames[info->entryType], &(psd->str)); - - case REGISTRY_COLUMN_VALUE: - psd->fmt = LVCFMT_LEFT; + case REGISTRY_COLUMN_VALUE: + { + psd->fmt = LVCFMT_LEFT; - PCWSTR strValueContents; + PCWSTR strValueContents; - hr = FormatContentsForDisplay(info, m_hRoot, m_NtPath, &strValueContents); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + hr = FormatContentsForDisplay(info, m_hRoot, m_NtPath, &strValueContents); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - if (hr == S_FALSE) - { - return MakeStrRetFromString(L"(Empty)", &(psd->str)); - } + if (hr == S_FALSE) + { + return MakeStrRetFromString(L"(Empty)", &(psd->str)); + } - hr = MakeStrRetFromString(strValueContents, &(psd->str)); + hr = MakeStrRetFromString(strValueContents, &(psd->str)); - CoTaskMemFree((PVOID)strValueContents); + CoTaskMemFree((PVOID)strValueContents); - return hr; + return hr; + } } } else { switch (iColumn) { - case REGISTRY_COLUMN_NAME: - psd->fmt = LVCFMT_LEFT; - psd->cxChar = 30; + 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"Object Name", &(psd->str)); + return S_OK; - // TODO: Make localizable - MakeStrRetFromString(L"Content Type", &(psd->str)); - return S_OK; - case REGISTRY_COLUMN_VALUE: - psd->fmt = LVCFMT_LEFT; - psd->cxChar = 20; + case REGISTRY_COLUMN_TYPE: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 20; - // TODO: Make localizable - MakeStrRetFromString(L"Value", &(psd->str)); - return S_OK; + // 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; } } @@ -354,18 +365,20 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::MapColumnToSCID( 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; + 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; } @@ -392,15 +405,15 @@ HRESULT CRegistryFolder::CompareIDs(LPARAM lParam, const RegPidlEntry * first, c switch (column) { - case REGISTRY_COLUMN_NAME: - return CompareName(lParam, first, second); + case REGISTRY_COLUMN_NAME: + return CompareName(lParam, first, second); - case REGISTRY_COLUMN_TYPE: - return MAKE_COMPARE_HRESULT(second->contentType - first->contentType); + case REGISTRY_COLUMN_TYPE: + return MAKE_COMPARE_HRESULT(second->contentType - first->contentType); - case REGISTRY_COLUMN_VALUE: - // Can't sort by link target yet - return E_INVALIDARG; + case REGISTRY_COLUMN_VALUE: + // Can't sort by link target yet + return E_INVALIDARG; } DbgPrint("Unsupported sorting mode.\n"); @@ -448,99 +461,105 @@ HRESULT CRegistryFolder::FormatValueData(DWORD contentType, PVOID td, DWORD cont { switch (contentType) { - case 0: - { - PCWSTR strTodo = L""; - DWORD bufferLength = (wcslen(strTodo) + 1) * sizeof(WCHAR); - PWSTR strValue = (PWSTR)CoTaskMemAlloc(bufferLength); - StringCbCopyW(strValue, bufferLength, strTodo); - *strContents = strValue; - return S_OK; - } - case REG_SZ: - case REG_EXPAND_SZ: - { - PWSTR strValue = (PWSTR)CoTaskMemAlloc(contentsLength + sizeof(WCHAR)); - StringCbCopyNW(strValue, contentsLength + sizeof(WCHAR), (LPCWSTR)td, contentsLength); - *strContents = strValue; - return S_OK; - } - case REG_MULTI_SZ: - { - PCWSTR separator = L" "; // To match regedit - size_t sepChars = wcslen(separator); - int strings = 0; - int stringChars = 0; + case 0: + { + PCWSTR strTodo = L""; + DWORD bufferLength = (wcslen(strTodo) + 1) * sizeof(WCHAR); + PWSTR strValue = (PWSTR)CoTaskMemAlloc(bufferLength); + StringCbCopyW(strValue, bufferLength, strTodo); + *strContents = strValue; + return S_OK; + } - PCWSTR strData = (PCWSTR)td; - while (*strData) + case REG_SZ: + case REG_EXPAND_SZ: { - size_t len = wcslen(strData); - stringChars += len; - strData += len + 1; // Skips null-terminator - strings++; + PWSTR strValue = (PWSTR)CoTaskMemAlloc(contentsLength + sizeof(WCHAR)); + StringCbCopyNW(strValue, contentsLength + sizeof(WCHAR), (LPCWSTR)td, contentsLength); + *strContents = strValue; + return S_OK; } - int cch = stringChars + (strings - 1) * sepChars + 1; + case REG_MULTI_SZ: + { + PCWSTR separator = L" "; // To match regedit + size_t sepChars = wcslen(separator); + int strings = 0; + int stringChars = 0; + + PCWSTR strData = (PCWSTR)td; + while (*strData) + { + size_t len = wcslen(strData); + stringChars += len; + strData += len + 1; // Skips null-terminator + strings++; + } + + int cch = stringChars + (strings - 1) * sepChars + 1; + + PWSTR strValue = (PWSTR)CoTaskMemAlloc(cch * sizeof(WCHAR)); - PWSTR strValue = (PWSTR)CoTaskMemAlloc(cch * sizeof(WCHAR)); + strValue[0] = 0; - strValue[0] = 0; + strData = (PCWSTR)td; + while (*strData) + { + StrCatW(strValue, strData); + strData += wcslen(strData) + 1; + if (*strData) + StrCatW(strValue, separator); + } - strData = (PCWSTR)td; - while (*strData) + *strContents = strValue; + return S_OK; + } + + case REG_DWORD: { - StrCatW(strValue, strData); - strData += wcslen(strData) + 1; - if (*strData) - StrCatW(strValue, separator); + 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; } - *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 (%lld)", - *(LARGE_INTEGER*)td, ((LARGE_INTEGER*)td)->QuadPart); - *strContents = strValue; - return S_OK; - } - case REG_BINARY: - { - DWORD bufferLength = (contentsLength * 3 + 1) * sizeof(WCHAR); - PWSTR strValue = (PWSTR)CoTaskMemAlloc(bufferLength); - PWSTR strTemp = strValue; - PBYTE data = (PBYTE)td; - for (DWORD i = 0; i < contentsLength; i++) + case REG_QWORD: { - StringCbPrintfW(strTemp, bufferLength, L"%02x ", data[i]); - strTemp += 3; - bufferLength -= 3; + DWORD bufferLength = 64 * sizeof(WCHAR); + PWSTR strValue = (PWSTR)CoTaskMemAlloc(bufferLength); + StringCbPrintfW(strValue, bufferLength, L"0x%016llx (%lld)", + *(LARGE_INTEGER*)td, ((LARGE_INTEGER*)td)->QuadPart); + *strContents = strValue; + return S_OK; + } + + case REG_BINARY: + { + DWORD bufferLength = (contentsLength * 3 + 1) * sizeof(WCHAR); + PWSTR strValue = (PWSTR)CoTaskMemAlloc(bufferLength); + PWSTR strTemp = strValue; + PBYTE data = (PBYTE)td; + for (DWORD i = 0; i < contentsLength; i++) + { + StringCbPrintfW(strTemp, bufferLength, L"%02x ", data[i]); + strTemp += 3; + bufferLength -= 3; + } + *strContents = strValue; + return S_OK; + } + + default: + { + PCWSTR strFormat = L"<Unimplemented value type %d>"; + DWORD bufferLength = (wcslen(strFormat) + 15) * sizeof(WCHAR); + PWSTR strValue = (PWSTR)CoTaskMemAlloc(bufferLength); + StringCbPrintfW(strValue, bufferLength, strFormat, contentType); + *strContents = strValue; + return S_OK; } - *strContents = strValue; - return S_OK; - } - default: - { - PCWSTR strFormat = L"<Unimplemented value type %d>"; - DWORD bufferLength = (wcslen(strFormat) + 15) * sizeof(WCHAR); - PWSTR strValue = (PWSTR)CoTaskMemAlloc(bufferLength); - StringCbPrintfW(strValue, bufferLength, strFormat, contentType); - *strContents = strValue; - return S_OK; - } } } diff --git a/dll/shellext/ntobjshex/regfolder.h b/dll/shellext/ntobjshex/regfolder.h index 08f687f8ce7..5780d075f40 100644 --- a/dll/shellext/ntobjshex/regfolder.h +++ b/dll/shellext/ntobjshex/regfolder.h @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS shell extensions - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/shellext/ntobjshex/regfolder.h - * PURPOSE: NT Object Namespace shell extension - * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> + * PROJECT: NT Object Namespace shell extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: System Registry folder class header + * COPYRIGHT: Copyright 2015-2017 David Quintana <gigaherz(a)gmail.com> */ + #pragma once extern const GUID CLSID_RegistryFolder;

1 0

[reactos] 01/01: [SHELL32] Fix detailed list views in Control Panel and Registry Folder
by Muthu R Kumar 20 Dec '22

20 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c25af5bd4ac8ea3bdfb8… commit 4c25af5bd4ac8ea3bdfb855478683980922ed32b Author: Muthu R Kumar <muthu90tech(a)gmail.com> AuthorDate: Tue Dec 20 07:42:07 2022 -0800 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 20 18:42:07 2022 +0300 [SHELL32] Fix detailed list views in Control Panel and Registry Folder - Add enums for Control Panel and Registry Folder columns - Fix iColumn values in GetDetailsOf() and fix checks in GetDefaultColumnState() Current CControlPanelFolder::CompareIDs was using wrong lparam column index. Actual column index should be 1 instead of 4. Because of this the comment column next to name in details view was not being displayed correctly. The same fixes for CRegFolder class functions. PR #4944. CORE-18743 CORE-18501 --- dll/win32/shell32/folders/CControlPanelFolder.cpp | 24 ++++++++++++++--------- dll/win32/shell32/folders/CRegFolder.cpp | 16 +++++++++++---- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index 5782ed49d3c..ff62b2e964f 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -52,7 +52,12 @@ static const shvheader ControlPanelSFHeader[] = { {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 80},/*FIXME*/ }; -#define CONROLPANELSHELLVIEWCOLUMNS 2 +enum controlpanel_columns +{ + CONTROLPANEL_COL_NAME, + CONTROLPANEL_COL_COMMENT, + CONTROLPANEL_COL_COUNT, +}; CControlPanelEnum::CControlPanelEnum() { @@ -324,16 +329,16 @@ HRESULT WINAPI CControlPanelFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE PIDLCPanelStruct *pData1 = _ILGetCPanelPointer(pidl1); PIDLCPanelStruct *pData2 = _ILGetCPanelPointer(pidl2); - if (!pData1 || !pData2 || LOWORD(lParam)>= CONROLPANELSHELLVIEWCOLUMNS) + if (!pData1 || !pData2 || LOWORD(lParam) >= CONTROLPANEL_COL_COUNT) return E_INVALIDARG; int result; switch(LOWORD(lParam)) { - case 0: /* name */ + case CONTROLPANEL_COL_NAME: result = wcsicmp(pData1->szName + pData1->offsDispName, pData2->szName + pData2->offsDispName); break; - case 4: /* comment */ + case CONTROLPANEL_COL_COMMENT: result = wcsicmp(pData1->szName + pData1->offsComment, pData2->szName + pData2->offsComment); break; default: @@ -544,7 +549,8 @@ HRESULT WINAPI CControlPanelFolder::GetDefaultColumnState(UINT iColumn, DWORD *p { TRACE("(%p)\n", this); - if (!pcsFlags || iColumn >= CONROLPANELSHELLVIEWCOLUMNS) return E_INVALIDARG; + if (!pcsFlags || iColumn >= CONTROLPANEL_COL_COUNT) + return E_INVALIDARG; *pcsFlags = ControlPanelSFHeader[iColumn].pcsFlags; return S_OK; } @@ -557,7 +563,7 @@ HRESULT WINAPI CControlPanelFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHC HRESULT WINAPI CControlPanelFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { - if (!psd || iColumn >= CONROLPANELSHELLVIEWCOLUMNS) + if (!psd || iColumn >= CONTROLPANEL_COL_COUNT) return E_INVALIDARG; if (!pidl) @@ -579,14 +585,14 @@ HRESULT WINAPI CControlPanelFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iCol switch(iColumn) { - case 0: /* name */ + case CONTROLPANEL_COL_NAME: return SHSetStrRet(&psd->str, pCPanel->szName + pCPanel->offsDispName); - case 4: /* comment */ + case CONTROLPANEL_COL_COMMENT: return SHSetStrRet(&psd->str, pCPanel->szName + pCPanel->offsComment); } } - return S_OK; + return E_FAIL; } HRESULT WINAPI CControlPanelFolder::MapColumnToSCID(UINT column, SHCOLUMNID *pscid) diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 11652661f01..464d00fe55b 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -212,6 +212,14 @@ class CRegFolderEnum : END_COM_MAP() }; +enum registry_columns +{ + REGISTRY_COL_NAME, + REGISTRY_COL_TYPE, + REGISTRY_COL_VALUE, + REGISTRY_COL_COUNT, +}; + CRegFolderEnum::CRegFolderEnum() { } @@ -723,7 +731,7 @@ HRESULT WINAPI CRegFolder::GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pD HRESULT WINAPI CRegFolder::GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags) { - if (iColumn >= 2) + if (iColumn >= REGISTRY_COL_COUNT) return E_INVALIDARG; *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT; return S_OK; @@ -749,11 +757,11 @@ HRESULT WINAPI CRegFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHEL switch(iColumn) { - case 0: /* name */ + case REGISTRY_COL_NAME: return GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); - case 1: /* type */ + case REGISTRY_COL_TYPE: return SHSetStrRet(&psd->str, IDS_SYSTEMFOLDER); - case 4: /* comments */ + case REGISTRY_COL_VALUE: HKEY hKey; if (!HCR_RegOpenClassIDKey(*clsid, &hKey)) return SHSetStrRet(&psd->str, "");

1 0

[reactos] 01/01: [RPCRT4_WINETEST] Remove obsolete todo_wine
by Eric Kohl 19 Dec '22

19 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28088ab25da735ce57dd9… commit 28088ab25da735ce57dd9feeb5eab56ab5e8a01b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 19 17:58:02 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 19 17:58:02 2022 +0100 [RPCRT4_WINETEST] Remove obsolete todo_wine Addendum to 00ccbd2f --- modules/rostests/winetests/rpcrt4/rpc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/rostests/winetests/rpcrt4/rpc.c b/modules/rostests/winetests/rpcrt4/rpc.c index dcf7a2d9608..32cd77bdafc 100644 --- a/modules/rostests/winetests/rpcrt4/rpc.c +++ b/modules/rostests/winetests/rpcrt4/rpc.c @@ -634,14 +634,11 @@ static void test_RpcStringBindingParseA(void) /* test with invalid binding */ status = RpcStringBindingParseA(invalid_binding, &uuid, &protseq, &network_addr, &endpoint, &options); - todo_wine ok(status == RPC_S_INVALID_STRING_BINDING, "RpcStringBindingParseA should have returned RPC_S_INVALID_STRING_BINDING instead of %d\n", status); - todo_wine ok(uuid == NULL, "uuid was %p instead of NULL\n", uuid); if (uuid) RpcStringFreeA(&uuid); ok(protseq == NULL, "protseq was %p instead of NULL\n", protseq); - todo_wine ok(network_addr == NULL, "network_addr was %p instead of NULL\n", network_addr); if (network_addr) RpcStringFreeA(&network_addr);

1 0

[reactos] 01/01: [RPCRT4] RpcStringBindingParseA/W must fail, if a colon is missing in the string binding
by Eric Kohl 19 Dec '22

19 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00ccbd2f39f93a88d5a8a… commit 00ccbd2f39f93a88d5a8a9e02a757be29b8d3fb3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 19 16:13:58 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 19 16:13:58 2022 +0100 [RPCRT4] RpcStringBindingParseA/W must fail, if a colon is missing in the string binding This fixes a bug in the rpc winetest. This patch will be sent upstream. --- dll/win32/rpcrt4/rpc_binding.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/rpcrt4/rpc_binding.c b/dll/win32/rpcrt4/rpc_binding.c index 640e17673c6..80278b98570 100644 --- a/dll/win32/rpcrt4/rpc_binding.c +++ b/dll/win32/rpcrt4/rpc_binding.c @@ -601,6 +601,8 @@ RPC_STATUS WINAPI RpcStringBindingParseA( RPC_CSTR StringBinding, RPC_CSTR *ObjU if (next) { if (Protseq) *Protseq = unescape_string_binding_component(data, next - data); data = next+1; + } else { + goto fail; } next = string_binding_find_delimiter(data, '['); @@ -711,6 +713,8 @@ RPC_STATUS WINAPI RpcStringBindingParseW( RPC_WSTR StringBinding, RPC_WSTR *ObjU if (next) { if (Protseq) *Protseq = unescape_string_binding_componentW(data, next - data); data = next+1; + } else { + goto fail; } next = string_binding_find_delimiterW(data, '[');

1 0

[reactos] 01/01: [RPCRT4] Call WSAStartup in rpcrt4_ip_tcp_get_top_of_tower
by Eric Kohl 19 Dec '22

19 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d01de6dc8b892027f3d28… commit d01de6dc8b892027f3d284973af8c8eca41c65f9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 19 13:39:52 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 19 13:39:52 2022 +0100 [RPCRT4] Call WSAStartup in rpcrt4_ip_tcp_get_top_of_tower This fixes the crash in the rpc winetest. --- dll/win32/rpcrt4/rpc_transport.c | 12 ++++++++++++ dll/win32/rpcrt4/rpcrt4_ros.diff | 19 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dll/win32/rpcrt4/rpc_transport.c b/dll/win32/rpcrt4/rpc_transport.c index be0d052bef3..9edc2ee718d 100644 --- a/dll/win32/rpcrt4/rpc_transport.c +++ b/dll/win32/rpcrt4/rpc_transport.c @@ -1257,6 +1257,18 @@ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data, hints.ai_canonname = NULL; hints.ai_next = NULL; +#ifdef __REACTOS__ + static BOOL wsa_inited; + if (!wsa_inited) + { + WSADATA wsadata; + WSAStartup(MAKEWORD(2, 2), &wsadata); + /* Note: WSAStartup can be called more than once so we don't bother with + * making accesses to wsa_inited thread-safe */ + wsa_inited = TRUE; + } +#endif + ret = getaddrinfo(networkaddr, endpoint, &hints, &ai); if (ret) { diff --git a/dll/win32/rpcrt4/rpcrt4_ros.diff b/dll/win32/rpcrt4/rpcrt4_ros.diff index 83aaa1ec610..ff46dad36aa 100644 --- a/dll/win32/rpcrt4/rpcrt4_ros.diff +++ b/dll/win32/rpcrt4/rpcrt4_ros.diff @@ -257,3 +257,22 @@ diff -pudN e:\wine\dlls\rpcrt4/rpc_transport.c e:\reactos\dll\win32\rpcrt4/rpc_t break; } } +@@ -1257,6 +1257,18 @@ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data, + hints.ai_canonname = NULL; + hints.ai_next = NULL; + ++#ifdef __REACTOS__ ++ static BOOL wsa_inited; ++ if (!wsa_inited) ++ { ++ WSADATA wsadata; ++ WSAStartup(MAKEWORD(2, 2), &wsadata); ++ /* Note: WSAStartup can be called more than once so we don't bother with ++ * making accesses to wsa_inited thread-safe */ ++ wsa_inited = TRUE; ++ } ++#endif ++ + ret = getaddrinfo(networkaddr, endpoint, &hints, &ai); + if (ret) + {

1 0

[reactos] 01/01: [RPCRT4] RpcStringFreeA/W must set the pointer to NULL
by Eric Kohl 19 Dec '22

19 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a783979ff660f5267c3c… commit 2a783979ff660f5267c3c2020b8ff06bf9ab0341 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 19 09:18:22 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 19 09:18:48 2022 +0100 [RPCRT4] RpcStringFreeA/W must set the pointer to NULL Add a matching wine test. This change will be sent upstream. --- dll/win32/rpcrt4/rpcrt4_main.c | 2 ++ modules/rostests/winetests/rpcrt4/rpc.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dll/win32/rpcrt4/rpcrt4_main.c b/dll/win32/rpcrt4/rpcrt4_main.c index 67a3dbe595f..7cc8d0b06b2 100644 --- a/dll/win32/rpcrt4/rpcrt4_main.c +++ b/dll/win32/rpcrt4/rpcrt4_main.c @@ -158,6 +158,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) RPC_STATUS WINAPI RpcStringFreeA(RPC_CSTR* String) { HeapFree( GetProcessHeap(), 0, *String); + if (String) *String = NULL; return RPC_S_OK; } @@ -174,6 +175,7 @@ RPC_STATUS WINAPI RpcStringFreeA(RPC_CSTR* String) RPC_STATUS WINAPI RpcStringFreeW(RPC_WSTR* String) { HeapFree( GetProcessHeap(), 0, *String); + if (String) *String = NULL; return RPC_S_OK; } diff --git a/modules/rostests/winetests/rpcrt4/rpc.c b/modules/rostests/winetests/rpcrt4/rpc.c index d3a3aee6c8c..dcf7a2d9608 100644 --- a/modules/rostests/winetests/rpcrt4/rpc.c +++ b/modules/rostests/winetests/rpcrt4/rpc.c @@ -854,6 +854,22 @@ static void test_RpcBindingFree(void) status); } +static void test_RpcStringFree(void) +{ + RPC_WSTR string = NULL; + + string = HeapAlloc(GetProcessHeap(), 0, 10*sizeof(WCHAR)); + if (string == NULL) + { + skip("Failed to allocate a string!\n"); + return; + } + + RpcStringFreeW(&string); + + ok(string == NULL, "String is %p expected NULL!\n", string); +} + static void test_RpcServerInqDefaultPrincName(void) { RPC_STATUS ret; @@ -1204,6 +1220,7 @@ START_TEST( rpc ) test_UuidCreate(); test_UuidCreateSequential(); test_RpcBindingFree(); + test_RpcStringFree(); test_RpcServerInqDefaultPrincName(); test_RpcServerRegisterAuthInfo();

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

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 December 2022