Ros-diffs

ros-diffs@reactos.org

21 participants
80597 discussions

[reactos] 03/03: [FASTFAT] Use debug bitmap

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9a287e9a5fffc6c02a9e… commit d9a287e9a5fffc6c02a9e6885ef8de41fd88485f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 1 16:26:17 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 14 20:15:07 2024 +0300 [FASTFAT] Use debug bitmap This is to figure out, whether the bitmap gets corrupted or if there is something else going on. --- drivers/filesystems/fastfat/fatprocs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/filesystems/fastfat/fatprocs.h b/drivers/filesystems/fastfat/fatprocs.h index f89f2325bee..86761acd7fc 100644 --- a/drivers/filesystems/fastfat/fatprocs.h +++ b/drivers/filesystems/fastfat/fatprocs.h @@ -36,6 +36,7 @@ Abstract: #include <ntintsafe.h> #ifdef __REACTOS__ #include <pseh/pseh2.h> +#include <dbgbitmap.h> #endif

2 days, 2 hours

[reactos] 02/03: [SDK] Implement RTL debug bitmap

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f4acea87462a212f1983… commit 8f4acea87462a212f1983b5d35452a12623c99e2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 1 14:40:36 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 14 20:15:07 2024 +0300 [SDK] Implement RTL debug bitmap This is a single header that wraps around the RTL bitmap API. It keeps track of the number of set bits and a hash of the bitmap. The integrity of the bitmap is checked on each call to any of the RTL bitmap APIs. This only works, if the bitmap is consistently modified using only RTL bitmap APIs and not manually messing with the bitmap buffer. --- sdk/include/reactos/dbgbitmap.h | 349 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) diff --git a/sdk/include/reactos/dbgbitmap.h b/sdk/include/reactos/dbgbitmap.h new file mode 100644 index 00000000000..1e13de22a4f --- /dev/null +++ b/sdk/include/reactos/dbgbitmap.h @@ -0,0 +1,349 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Helper functions to debug RTL_BITMAP + * COPYRIGHT: Copyright 2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#pragma once + +#include <ndk/rtlfuncs.h> + +typedef struct _RTL_BITMAP_DBG +{ + union + { + struct + { + ULONG SizeOfBitMap; + PULONG Buffer; + }; + RTL_BITMAP BitMap; + }; + ULONG NumberOfSetBits; + ULONG BitmapHash; +} RTL_BITMAP_DBG, *PRTL_BITMAP_DBG; + +static inline +ULONG fnv1a_hash(ULONG *data, size_t length) +{ + ULONG hash = 2166136261u; // FNV offset basis (a large prime number) + for (size_t i = 0; i < length; ++i) + { + hash ^= data[i]; + hash *= 16777619u; // FNV prime + } + return hash; +} + +static inline +ULONG +RtlComputeBitmapHashDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader) +{ + ULONG SizeInBytes = ALIGN_UP_BY(BitMapHeader->BitMap.SizeOfBitMap, 32) / 32; + return fnv1a_hash(BitMapHeader->BitMap.Buffer, SizeInBytes / sizeof(ULONG)); +} + +static inline +VOID +RtlValidateBitmapDbg( + _Inout_ PRTL_BITMAP_DBG BitMapHeader) +{ + ULONG NumberOfSetBits = RtlNumberOfSetBits(&BitMapHeader->BitMap); + ASSERT(BitMapHeader->NumberOfSetBits == NumberOfSetBits); + ULONG BitmapHash = RtlComputeBitmapHashDbg(BitMapHeader); + ASSERT(BitMapHeader->BitmapHash == BitmapHash); +} + +_At_(BitMapHeader->SizeOfBitMap, _Post_equal_to_(SizeOfBitMap)) +_At_(BitMapHeader->Buffer, _Post_equal_to_(BitMapBuffer)) +static inline +VOID +RtlInitializeBitMapDbg( + _Out_ PRTL_BITMAP_DBG BitMapHeader, + _In_opt_ __drv_aliasesMem PULONG BitMapBuffer, + _In_opt_ ULONG SizeOfBitMap) +{ + RtlInitializeBitMap(&BitMapHeader->BitMap, BitMapBuffer, SizeOfBitMap); + BitMapHeader->NumberOfSetBits = RtlNumberOfSetBits(&BitMapHeader->BitMap); + BitMapHeader->BitmapHash = RtlComputeBitmapHashDbg(BitMapHeader); +} + +static inline +BOOLEAN +RtlAreBitsClearDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_ ULONG StartingIndex, + _In_ ULONG Length) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlAreBitsClear(&BitMapHeader->BitMap, StartingIndex, Length); +} + +static inline +BOOLEAN +RtlAreBitsSetDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_ ULONG StartingIndex, + _In_ ULONG Length) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlAreBitsSet(&BitMapHeader->BitMap, StartingIndex, Length); +} + +static inline +VOID +RtlClearAllBitsDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader) +{ + RtlValidateBitmapDbg(BitMapHeader); + RtlClearAllBits(&BitMapHeader->BitMap); + BitMapHeader->NumberOfSetBits = 0; + BitMapHeader->BitmapHash = RtlComputeBitmapHashDbg(BitMapHeader); +} + +static inline +VOID +RtlClearBitDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitNumber) +{ + RtlValidateBitmapDbg(BitMapHeader); + if (RtlCheckBit(&BitMapHeader->BitMap, BitNumber) == FALSE) + { + BitMapHeader->NumberOfSetBits--; + } + RtlClearBit(&BitMapHeader->BitMap, BitNumber); + BitMapHeader->BitmapHash = RtlComputeBitmapHashDbg(BitMapHeader); +} + +static inline +VOID +RtlClearBitsDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_range_(0, BitMapHeader->SizeOfBitMap - NumberToClear) ULONG StartingIndex, + _In_range_(0, BitMapHeader->SizeOfBitMap - StartingIndex) ULONG NumberToClear) +{ + RtlValidateBitmapDbg(BitMapHeader); + RtlClearBits(&BitMapHeader->BitMap, StartingIndex, NumberToClear); + BitMapHeader->NumberOfSetBits = RtlNumberOfSetBits(&BitMapHeader->BitMap); + BitMapHeader->BitmapHash = RtlComputeBitmapHashDbg(BitMapHeader); +} + +static inline +ULONG +RtlFindClearBitsDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_ ULONG NumberToFind, + _In_ ULONG HintIndex) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlFindClearBits(&BitMapHeader->BitMap, NumberToFind, HintIndex); +} + +static inline +ULONG +RtlFindClearBitsAndSetDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_ ULONG NumberToFind, + _In_ ULONG HintIndex) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlFindClearBitsAndSet(&BitMapHeader->BitMap, NumberToFind, HintIndex); +} + +static inline +ULONG +RtlFindFirstRunClearDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _Out_ PULONG StartingIndex) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlFindFirstRunClear(&BitMapHeader->BitMap, StartingIndex); +} + +static inline +ULONG +RtlFindClearRunsDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _Out_writes_to_(SizeOfRunArray, return) PRTL_BITMAP_RUN RunArray, + _In_range_(>, 0) ULONG SizeOfRunArray, + _In_ BOOLEAN LocateLongestRuns) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlFindClearRuns(&BitMapHeader->BitMap, RunArray, SizeOfRunArray, LocateLongestRuns); +} + +static inline +ULONG +RtlFindLastBackwardRunClearDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_ ULONG FromIndex, + _Out_ PULONG StartingRunIndex) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlFindLastBackwardRunClear(&BitMapHeader->BitMap, FromIndex, StartingRunIndex); +} + +static inline +ULONG +RtlFindLongestRunClearDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _Out_ PULONG StartingIndex) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlFindLongestRunClear(&BitMapHeader->BitMap, StartingIndex); +} + +static inline +ULONG +RtlFindNextForwardRunClearDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_ ULONG FromIndex, + _Out_ PULONG StartingRunIndex) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlFindNextForwardRunClear(&BitMapHeader->BitMap, FromIndex, StartingRunIndex); +} + +static inline +ULONG +RtlFindNextForwardRunSetDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_ ULONG FromIndex, + _Out_ PULONG StartingRunIndex) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlFindNextForwardRunSet(&BitMapHeader->BitMap, FromIndex, StartingRunIndex); +} + +static inline +ULONG +RtlFindSetBitsDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_ ULONG NumberToFind, + _In_ ULONG HintIndex) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlFindSetBits(&BitMapHeader->BitMap, NumberToFind, HintIndex); +} + +static inline +ULONG +RtlFindSetBitsAndClearDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_ ULONG NumberToFind, + _In_ ULONG HintIndex) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlFindSetBitsAndClear(&BitMapHeader->BitMap, NumberToFind, HintIndex); +} + +static inline +ULONG +RtlNumberOfClearBitsDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlNumberOfClearBits(&BitMapHeader->BitMap); +} + +static inline +ULONG +RtlNumberOfSetBitsDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlNumberOfSetBits(&BitMapHeader->BitMap); +} + +static inline +VOID +RtlSetBitDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitNumber) +{ + RtlValidateBitmapDbg(BitMapHeader); + if (RtlCheckBit(&BitMapHeader->BitMap, BitNumber) == FALSE) + { + BitMapHeader->NumberOfSetBits++; + } + RtlSetBit(&BitMapHeader->BitMap, BitNumber); + BitMapHeader->BitmapHash = RtlComputeBitmapHashDbg(BitMapHeader); +} + +static inline +VOID +RtlSetBitsDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_range_(0, BitMapHeader->SizeOfBitMap - NumberToSet) ULONG StartingIndex, + _In_range_(0, BitMapHeader->SizeOfBitMap - StartingIndex) ULONG NumberToSet) +{ + RtlValidateBitmapDbg(BitMapHeader); + RtlSetBits(&BitMapHeader->BitMap, StartingIndex, NumberToSet); + BitMapHeader->NumberOfSetBits = RtlNumberOfSetBits(&BitMapHeader->BitMap); + BitMapHeader->BitmapHash = RtlComputeBitmapHashDbg(BitMapHeader); +} + +static inline +VOID +RtlSetAllBitsDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader) +{ + RtlValidateBitmapDbg(BitMapHeader); + RtlSetAllBits(&BitMapHeader->BitMap); + BitMapHeader->NumberOfSetBits = BitMapHeader->BitMap.SizeOfBitMap; + BitMapHeader->BitmapHash = RtlComputeBitmapHashDbg(BitMapHeader); +} + +_Must_inspect_result_ +static inline +BOOLEAN +RtlTestBitDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitNumber) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlTestBit(&BitMapHeader->BitMap, BitNumber); +} + +_Must_inspect_result_ +static inline +BOOLEAN +RtlCheckBitDbg( + _In_ PRTL_BITMAP_DBG BitMapHeader, + _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitPosition) +{ + RtlValidateBitmapDbg(BitMapHeader); + return RtlCheckBit(&BitMapHeader->BitMap, BitPosition); +} + +#define _RTL_BITMAP _RTL_BITMAP_DBG +#define RTL_BITMAP RTL_BITMAP_DBG +#define PRTL_BITMAP PRTL_BITMAP_DBG + +#define RtlInitializeBitMap RtlInitializeBitMapDbg +#define RtlAreBitsClear RtlAreBitsClearDbg +#define RtlAreBitsSet RtlAreBitsSetDbg +#define RtlClearAllBits RtlClearAllBitsDbg +#define RtlClearBit RtlClearBitDbg +#define RtlClearBits RtlClearBitsDbg +#define RtlFindClearBits RtlFindClearBitsDbg +#define RtlFindClearBitsAndSet RtlFindClearBitsAndSetDbg +#define RtlFindFirstRunClear RtlFindFirstRunClearDbg +#define RtlFindClearRuns RtlFindClearRunsDbg +#define RtlFindLastBackwardRunClear RtlFindLastBackwardRunClearDbg +#define RtlFindLongestRunClear RtlFindLongestRunClearDbg +#define RtlFindNextForwardRunClear RtlFindNextForwardRunClearDbg +#define RtlFindNextForwardRunSet RtlFindNextForwardRunSetDbg +#define RtlFindSetBits RtlFindSetBitsDbg +#define RtlFindSetBitsAndClear RtlFindSetBitsAndClearDbg +#define RtlNumberOfClearBits RtlNumberOfClearBitsDbg +#define RtlNumberOfSetBits RtlNumberOfSetBitsDbg +#define RtlSetBit RtlSetBitDbg +#define RtlSetBits RtlSetBitsDbg +#define RtlSetAllBits RtlSetAllBitsDbg +#define RtlTestBit RtlTestBitDbg +#undef RtlCheckBit +#define RtlCheckBit RtlCheckBitDbg

2 days, 2 hours

[reactos] 01/03: [XDK] Add RtlFindNextForwardRunSet for wdm.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5531f51267cc1a54775a… commit b5531f51267cc1a54775a8a21526ebaf4d7fd077 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 14 10:14:49 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 14 20:15:07 2024 +0300 [XDK] Add RtlFindNextForwardRunSet for wdm.h Windows DDK doesn't have it, but I think it won't hurt to have it. --- sdk/include/xdk/rtlfuncs.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sdk/include/xdk/rtlfuncs.h b/sdk/include/xdk/rtlfuncs.h index 276cfaf6cf9..88fd0f76baa 100644 --- a/sdk/include/xdk/rtlfuncs.h +++ b/sdk/include/xdk/rtlfuncs.h @@ -673,6 +673,14 @@ RtlFindNextForwardRunClear( _In_ ULONG FromIndex, _Out_ PULONG StartingRunIndex); +NTSYSAPI +ULONG +NTAPI +RtlFindNextForwardRunSet( + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG FromIndex, + _Out_ PULONG StartingRunIndex); + _Success_(return != -1) _Must_inspect_result_ NTSYSAPI

2 days, 2 hours

[reactos] 01/01: [SHELL32][MKSHELLLINK] Support EXP_SPECIAL_FOLDER datablock in shortcuts (#7158)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b081be46de966e3fe6c2… commit 7b081be46de966e3fe6c2aa47a5a26deb7541e8a Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Sep 14 13:10:49 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 14 13:10:49 2024 +0200 [SHELL32][MKSHELLLINK] Support EXP_SPECIAL_FOLDER datablock in shortcuts (#7158) CORE-19692 --- dll/win32/shell32/CShellLink.cpp | 16 +++++++ dll/win32/shell32/folders/CFSFolder.cpp | 36 +++++++++------ sdk/tools/mkshelllink/mkshelllink.c | 79 +++++++++++++++++++++++++++++++-- 3 files changed, 113 insertions(+), 18 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index d438fa204ff..bf2b5be44d5 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -746,6 +746,22 @@ HRESULT STDMETHODCALLTYPE CShellLink::Load(IStream *stm) if (FAILED(hr)) // FIXME: Should we fail? return hr; + LPEXP_SPECIAL_FOLDER pSpecial = (LPEXP_SPECIAL_FOLDER)SHFindDataBlock(m_pDBList, EXP_SPECIAL_FOLDER_SIG); + if (pSpecial && pSpecial->cbSize == sizeof(*pSpecial) && ILGetSize(m_pPidl) > pSpecial->cbOffset) + { + if (LPITEMIDLIST folder = SHCloneSpecialIDList(NULL, pSpecial->idSpecialFolder, FALSE)) + { + LPITEMIDLIST pidl = ILCombine(folder, (LPITEMIDLIST)((char*)m_pPidl + pSpecial->cbOffset)); + if (pidl) + { + ILFree(m_pPidl); + m_pPidl = pidl; + TRACE("Replaced pidl base with CSIDL %u up to %ub.\n", pSpecial->idSpecialFolder, pSpecial->cbOffset); + } + ILFree(folder); + } + } + if (TRACE_ON(shell)) { #if (NTDDI_VERSION < NTDDI_LONGHORN) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index bde0d6dbb42..3c7bb8f2d03 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -14,8 +14,20 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); static HRESULT SHELL32_GetCLSIDForDirectory(LPCWSTR pwszDir, LPCWSTR KeyName, CLSID* pclsidFolder); +static LPCWSTR GetItemFileName(PCUITEMID_CHILD pidl, LPWSTR Buf, UINT cchMax) +{ + FileStructW* pDataW = _ILGetFileStructW(pidl); + if (pDataW) + return pDataW->wszName; + LPPIDLDATA pdata = _ILGetDataPointer(pidl); + if ((pdata->type & PT_VALUEW) == PT_VALUEW) + return (LPWSTR)pdata->u.file.szNames; + if (_ILSimpleGetTextW(pidl, Buf, cchMax)) + return Buf; + return NULL; +} -HKEY OpenKeyFromFileType(LPWSTR pExtension, LPCWSTR KeyName) +static HKEY OpenKeyFromFileType(LPCWSTR pExtension, LPCWSTR KeyName) { HKEY hkey; @@ -45,7 +57,7 @@ HKEY OpenKeyFromFileType(LPWSTR pExtension, LPCWSTR KeyName) return hkey; } -LPWSTR ExtensionFromPidl(PCUIDLIST_RELATIVE pidl) +static LPCWSTR ExtensionFromPidl(PCUIDLIST_RELATIVE pidl, LPWSTR Buf, UINT cchMax) { if (!_ILIsValue(pidl)) { @@ -53,23 +65,17 @@ LPWSTR ExtensionFromPidl(PCUIDLIST_RELATIVE pidl) return NULL; } - FileStructW* pDataW = _ILGetFileStructW(pidl); - if (!pDataW) - { - ERR("Invalid pidl!\n"); - return NULL; - } - - LPWSTR pExtension = PathFindExtensionW(pDataW->wszName); + LPCWSTR name = GetItemFileName(pidl, Buf, cchMax); + LPCWSTR pExtension = name ? PathFindExtensionW(name) : NULL; if (!pExtension || *pExtension == UNICODE_NULL) { - WARN("No extension for %S!\n", pDataW->wszName); + WARN("No extension for %S!\n", name); return NULL; } return pExtension; } -HRESULT GetCLSIDForFileTypeFromExtension(LPWSTR pExtension, LPCWSTR KeyName, CLSID* pclsid) +static HRESULT GetCLSIDForFileTypeFromExtension(LPCWSTR pExtension, LPCWSTR KeyName, CLSID* pclsid) { HKEY hkeyProgId = OpenKeyFromFileType(pExtension, KeyName); if (!hkeyProgId) @@ -126,7 +132,8 @@ HRESULT GetCLSIDForFileTypeFromExtension(LPWSTR pExtension, LPCWSTR KeyName, CLS HRESULT GetCLSIDForFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName, CLSID* pclsid) { - LPWSTR pExtension = ExtensionFromPidl(pidl); + WCHAR buf[256]; + LPCWSTR pExtension = ExtensionFromPidl(pidl, buf, _countof(buf)); if (!pExtension) return S_FALSE; @@ -289,7 +296,8 @@ HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, RE } else { - LPWSTR pExtension = ExtensionFromPidl(pidl); + WCHAR extbuf[256]; + LPCWSTR pExtension = ExtensionFromPidl(pidl, extbuf, _countof(extbuf)); HKEY hkey = pExtension ? OpenKeyFromFileType(pExtension, L"DefaultIcon") : NULL; if (!hkey) WARN("Could not open DefaultIcon key!\n"); diff --git a/sdk/tools/mkshelllink/mkshelllink.c b/sdk/tools/mkshelllink/mkshelllink.c index 2cb921e567b..c01ad361db8 100644 --- a/sdk/tools/mkshelllink/mkshelllink.c +++ b/sdk/tools/mkshelllink/mkshelllink.c @@ -18,8 +18,14 @@ typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; #endif +#ifdef _WIN32 +#define strcasecmp _stricmp +#endif + #define SW_SHOWNORMAL 1 #define SW_SHOWMINNOACTIVE 7 +#define CSIDL_WINDOWS 0x24 +#define CSIDL_SYSTEM 0x25 typedef struct _GUID { @@ -125,17 +131,61 @@ typedef struct _ID_LIST_DRIVE uint16_t unknown; } ID_LIST_DRIVE; +#define EXP_SPECIAL_FOLDER_SIG 0xA0000005 +typedef struct _EXP_SPECIAL_FOLDER +{ + uint32_t cbSize, dwSignature, idSpecialFolder, cbOffset; +} EXP_SPECIAL_FOLDER; + #pragma pack(pop) +static const struct SPECIALFOLDER { + unsigned char csidl; + const char* name; +} g_specialfolders[] = { + { CSIDL_WINDOWS, "windows" }, + { CSIDL_SYSTEM, "system" }, + { 0, NULL} +}; + +static unsigned int is_path_separator(unsigned int c) +{ + return c == '\\' || c == '/'; +} + +static const struct SPECIALFOLDER* get_special_folder(const char *target) +{ + char buf[256]; + strncpy(buf, target, sizeof(buf)); + buf[sizeof("shell:") - 1] = '\0'; + if (strcasecmp("shell:", buf)) + return NULL; + + target += sizeof("shell:") - 1; + for (unsigned long i = 0;; ++i) + { + unsigned long len; + const struct SPECIALFOLDER *special = &g_specialfolders[i]; + if (!special->name) + return NULL; + len = strlen(special->name); + strncpy(buf, target, sizeof(buf)); + buf[len] = '\0'; + if (!strcasecmp(special->name, buf) && (is_path_separator(target[len]) || !target[len])) + return &g_specialfolders[i]; + } +} + int main(int argc, const char *argv[]) { int i; const char *pszOutputPath = "shortcut.lnk"; const char *pszTarget = NULL; - const char *pszDescription = "Description"; + const char *pszDescription = NULL; const char *pszWorkingDir = NULL; const char *pszCmdLineArgs = NULL; const char *pszIcon = NULL; + char targetpath[260]; int IconNr = 0; GUID Guid = CLSID_MyComputer; int bHelp = 0, bMinimized = 0; @@ -143,6 +193,7 @@ int main(int argc, const char *argv[]) LNK_HEADER Header; uint16_t uhTmp; uint32_t dwTmp; + EXP_SPECIAL_FOLDER CsidlBlock, *pCsidlBlock = NULL; for (i = 1; i < argc; ++i) { @@ -226,14 +277,26 @@ int main(int argc, const char *argv[]) ID_LIST_DRIVE IdListDrive; unsigned cbListSize = sizeof(IdListGuid) + sizeof(uint16_t), cchName; const char *pszName = pszTarget; + int index = 1, specialindex = -1; + const struct SPECIALFOLDER *special = get_special_folder(pszTarget); // ID list // It seems explorer does not accept links without id list. List is relative to desktop. - pszName = pszTarget; + if (special) + { + Header.Flags &= ~LINK_RELATIVE_PATH; + CsidlBlock.cbSize = sizeof(CsidlBlock); + CsidlBlock.dwSignature = EXP_SPECIAL_FOLDER_SIG; + CsidlBlock.idSpecialFolder = special->csidl; + specialindex = 3; // Skip GUID, drive and fake windows/reactos folder + sprintf(targetpath, "x:\\reactos\\%s", pszTarget + sizeof("shell:") + strlen(special->name)); + pszName = pszTarget = targetpath; + } - if (pszName[0] && pszName[1] == ':') + if (pszName[0] && pszName[0] != ':' && pszName[1] == ':') { + ++index; cbListSize += sizeof(IdListDrive); pszName += 2; while (*pszName == '\\' || *pszName == '/') @@ -249,6 +312,12 @@ int main(int argc, const char *argv[]) if (cchName != 1 || pszName[0] != '.') cbListSize += sizeof(IdListFile) + 2 * (cchName + 1); + if (++index == specialindex) + { + CsidlBlock.cbOffset = cbListSize - sizeof(uint16_t); + pCsidlBlock = &CsidlBlock; + } + pszName += cchName; while (*pszName == '\\' || *pszName == '/') ++pszName; @@ -309,7 +378,7 @@ int main(int argc, const char *argv[]) if (Header.Flags & LINK_DESCRIPTION) { - // Dscription + // Description uhTmp = strlen(pszDescription); fwrite(&uhTmp, sizeof(uhTmp), 1, pFile); fputs(pszDescription, pFile); @@ -348,6 +417,8 @@ int main(int argc, const char *argv[]) } // Extra stuff + if (pCsidlBlock) + fwrite(pCsidlBlock, sizeof(*pCsidlBlock), 1, pFile); dwTmp = 0; fwrite(&dwTmp, sizeof(dwTmp), 1, pFile);

2 days, 8 hours

[reactos] 01/01: [SHELL32][COMCTL32][BROWSEUI][EXPLORER] Update color usage on WM_SYSCOLORCHANGE (#7325)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=751641c2bec7ca2ef022f… commit 751641c2bec7ca2ef022f3a3dd89bd2fa09b83d3 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Sep 14 13:07:11 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 14 13:07:11 2024 +0200 [SHELL32][COMCTL32][BROWSEUI][EXPLORER] Update color usage on WM_SYSCOLORCHANGE (#7325) --- base/shell/explorer/traywnd.cpp | 6 ++++++ dll/win32/browseui/basebarsite.cpp | 13 ++++++++----- dll/win32/browseui/shellbrowser.cpp | 8 ++++++++ dll/win32/comctl32/rebar.c | 5 +++++ dll/win32/shell32/CDefView.cpp | 25 ++++++++++--------------- dll/win32/shell32/shlfileop.cpp | 1 + 6 files changed, 38 insertions(+), 20 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 868447796fc..ed2acdbfb54 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2542,6 +2542,11 @@ ChangePos: return (LRESULT) GetStockObject(HOLLOW_BRUSH); } + LRESULT OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + return SendMessageW(m_Rebar, uMsg, wParam, lParam); + } + LRESULT OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { RECT rcClient; @@ -3403,6 +3408,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(WM_NCPAINT, OnNcPaint) MESSAGE_HANDLER(WM_NCACTIVATE, OnNcActivate) MESSAGE_HANDLER(WM_CTLCOLORBTN, OnCtlColorBtn) + MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) MESSAGE_HANDLER(WM_MOVING, OnMoving) MESSAGE_HANDLER(WM_SIZING, OnSizing) MESSAGE_HANDLER(WM_WINDOWPOSCHANGING, OnWindowPosChanging) diff --git a/dll/win32/browseui/basebarsite.cpp b/dll/win32/browseui/basebarsite.cpp index eee836d846d..e67e9b7e9bd 100644 --- a/dll/win32/browseui/basebarsite.cpp +++ b/dll/win32/browseui/basebarsite.cpp @@ -714,7 +714,8 @@ LRESULT CBaseBarSite::OnCustomDraw(LPNMCUSTOMDRAW pnmcd) REBARBANDINFO info; WCHAR wszTitle[MAX_PATH]; DWORD index; - RECT rt; + UINT pad = GetSystemMetrics(SM_CXEDGE), leftpad = max(pad * 2, 4); + UINT btnw = 20, btnh = 18, btnarea = 1 + btnw + 1; HFONT newFont, oldFont; index = SendMessage(RB_IDTOINDEX, fCurrentActiveBar->fBandID , 0); @@ -722,20 +723,22 @@ LRESULT CBaseBarSite::OnCustomDraw(LPNMCUSTOMDRAW pnmcd) ZeroMemory(wszTitle, sizeof(wszTitle)); DrawEdge(pnmcd->hdc, &pnmcd->rc, EDGE_ETCHED, BF_BOTTOM); // We also resize our close button - ::SetWindowPos(toolbarWnd, HWND_TOP, pnmcd->rc.right - 22, 0, 20, 18, SWP_SHOWWINDOW); + ::SetWindowPos(toolbarWnd, HWND_TOP, pnmcd->rc.right - btnarea, 0, btnw, btnh, SWP_SHOWWINDOW); // Draw the text info.cch = MAX_PATH; info.lpText = wszTitle; - rt = pnmcd->rc; - rt.right -= 24; - rt.left += 2; + RECT rt = pnmcd->rc; + rt.right -= btnarea; + rt.left += leftpad; rt.bottom -= 1; if (FAILED_UNEXPECTEDLY(GetInternalBandInfo(index, &info, RBBIM_TEXT))) return CDRF_SKIPDEFAULT; newFont = GetTitleFont(); if (newFont) oldFont = (HFONT)SelectObject(pnmcd->hdc, newFont); + COLORREF orgclrtxt = SetTextColor(pnmcd->hdc, GetSysColor(COLOR_BTNTEXT)); DrawText(pnmcd->hdc, info.lpText, -1, &rt, DT_SINGLELINE | DT_LEFT | DT_VCENTER); + SetTextColor(pnmcd->hdc, orgclrtxt); SelectObject(pnmcd->hdc, oldFont); DeleteObject(newFont); return CDRF_SKIPDEFAULT; diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 219767387cb..eb67209a674 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -613,6 +613,7 @@ public: LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT RelayMsgToShellView(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnFolderOptions(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnMapNetworkDrive(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); @@ -664,6 +665,7 @@ public: MESSAGE_HANDLER(WM_DRAWITEM, RelayMsgToShellView) MESSAGE_HANDLER(WM_MENUSELECT, RelayMsgToShellView) MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange) + MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) COMMAND_ID_HANDLER(IDM_FILE_CLOSE, OnClose) COMMAND_ID_HANDLER(IDM_TOOLS_FOLDEROPTIONS, OnFolderOptions) COMMAND_ID_HANDLER(IDM_TOOLS_MAPNETWORKDRIVE, OnMapNetworkDrive) @@ -3796,6 +3798,12 @@ LRESULT CShellBrowser::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, return 0; } +LRESULT CShellBrowser::OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + SHPropagateMessage(m_hWnd, uMsg, wParam, lParam, TRUE); + return 0; +} + LRESULT CShellBrowser::OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { return SendMessage(WM_CLOSE); diff --git a/dll/win32/comctl32/rebar.c b/dll/win32/comctl32/rebar.c index 818ae9948f3..f68c6d5051f 100644 --- a/dll/win32/comctl32/rebar.c +++ b/dll/win32/comctl32/rebar.c @@ -2548,10 +2548,15 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, INT iIndex, const REBARBANDINFOW *lprbbi, /* initialize band */ memset(lpBand, 0, sizeof(*lpBand)); +#ifdef __REACTOS__ + lpBand->clrFore = infoPtr->clrText == CLR_NONE ? CLR_DEFAULT : infoPtr->clrText; + lpBand->clrBack = infoPtr->clrBk == CLR_NONE ? CLR_DEFAULT : infoPtr->clrBk; +#else lpBand->clrFore = infoPtr->clrText == CLR_NONE ? infoPtr->clrBtnText : infoPtr->clrText; lpBand->clrBack = infoPtr->clrBk == CLR_NONE ? infoPtr->clrBtnFace : infoPtr->clrBk; +#endif lpBand->iImage = -1; REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand); diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 61bc1581234..771576222fc 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -212,6 +212,11 @@ static UINT CalculateCharWidth(HWND hwnd) return ret; } +static inline COLORREF GetViewColor(COLORREF Clr, UINT SysFallback) +{ + return Clr != CLR_INVALID ? Clr : GetSysColor(SysFallback); +} + class CDefView : public CWindowImpl<CDefView, CWindow, CControlWinTraits>, public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -592,8 +597,8 @@ CDefView::CDefView() : ZeroMemory(&m_FolderSettings, sizeof(m_FolderSettings)); ZeroMemory(&m_ptLastMousePos, sizeof(m_ptLastMousePos)); ZeroMemory(&m_Category, sizeof(m_Category)); - m_viewinfo_data.clrText = GetSysColor(COLOR_WINDOWTEXT); - m_viewinfo_data.clrTextBack = GetSysColor(COLOR_WINDOW); + m_viewinfo_data.clrText = CLR_INVALID; + m_viewinfo_data.clrTextBack = CLR_INVALID; m_viewinfo_data.hbmBack = NULL; m_sortInfo.Reset(); @@ -934,18 +939,8 @@ void CDefView::UpdateListColors() } else { - // text background color - COLORREF clrTextBack = m_viewinfo_data.clrTextBack; - m_ListView.SetTextBkColor(clrTextBack); - - // text color - COLORREF clrText; - if (m_viewinfo_data.clrText != CLR_INVALID) - clrText = m_viewinfo_data.clrText; - else - clrText = GetSysColor(COLOR_WINDOWTEXT); - - m_ListView.SetTextColor(clrText); + m_ListView.SetTextBkColor(GetViewColor(m_viewinfo_data.clrTextBack, COLOR_WINDOW)); + m_ListView.SetTextColor(GetViewColor(m_viewinfo_data.clrText, COLOR_WINDOWTEXT)); // Background is painted by the parent via WM_PRINTCLIENT m_ListView.SetExtendedListViewStyle(LVS_EX_TRANSPARENTBKGND, LVS_EX_TRANSPARENTBKGND); @@ -1663,7 +1658,7 @@ LRESULT CDefView::OnPrintClient(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b } else { - FillRect(hDC, &rc, GetSysColorBrush(COLOR_WINDOW)); + SHFillRectClr(hDC, &rc, GetViewColor(m_viewinfo_data.clrTextBack, COLOR_WINDOW)); } bHandled = TRUE; diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 5e1309aabdf..9600add7517 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -129,6 +129,7 @@ static INT_PTR ConfirmMsgBox_Paint(HWND hDlg) BeginPaint(hDlg, &ps); hdc = ps.hdc; SetBkMode(hdc, TRANSPARENT); + SetTextColor(hdc, GetSysColor(COLOR_BTNTEXT)); GetClientRect(GetDlgItem(hDlg, IDC_YESTOALL_MESSAGE), &r); /* this will remap the rect to dialog coords */

2 days, 8 hours

[reactos] 01/01: [FREELDR] Support drives with 4k sector size PR was reviewed at pull/5784

by Laura Konopinska

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2fc578f6dcb2cdb3eae3… commit e2fc578f6dcb2cdb3eae340ce982e72b7dd6f0a9 Author: Laura Konopinska <alula(a)tuta.io> AuthorDate: Sat Sep 30 18:11:31 2023 +0200 Commit: Justin Miller <justin.miller(a)reactos.org> CommitDate: Thu Sep 12 20:53:10 2024 -0700 [FREELDR] Support drives with 4k sector size PR was reviewed at pull/5784 --- boot/freeldr/freeldr/arch/uefi/uefidisk.c | 2 +- boot/freeldr/freeldr/lib/fs/fat.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/freeldr/freeldr/arch/uefi/uefidisk.c b/boot/freeldr/freeldr/arch/uefi/uefidisk.c index 2d5458d4707..98d19b346f1 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefidisk.c +++ b/boot/freeldr/freeldr/arch/uefi/uefidisk.c @@ -415,7 +415,7 @@ UefiSetupBlockDevices(VOID) if (EFI_ERROR(Status) || bio == NULL || bio->Media->BlockSize == 0 || - bio->Media->BlockSize > 2048) + bio->Media->BlockSize > 4096) { TRACE("UefiSetupBlockDevices: UEFI has found a block device that failed, skipping\n"); continue; diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 1b5ad239e1f..556f8086430 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -1369,7 +1369,7 @@ BOOLEAN FatReadVolumeSectors(PFAT_VOLUME_INFO Volume, ULONG SectorNumber, ULONG // // Seek to right position // - Position.QuadPart = (ULONGLONG)SectorNumber * 512; + Position.QuadPart = (ULONGLONG)SectorNumber * Volume->BytesPerSector; Status = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); if (Status != ESUCCESS) { @@ -1380,8 +1380,8 @@ BOOLEAN FatReadVolumeSectors(PFAT_VOLUME_INFO Volume, ULONG SectorNumber, ULONG // // Read data // - Status = ArcRead(Volume->DeviceId, Buffer, SectorCount * 512, &Count); - if (Status != ESUCCESS || Count != SectorCount * 512) + Status = ArcRead(Volume->DeviceId, Buffer, SectorCount * Volume->BytesPerSector, &Count); + if (Status != ESUCCESS || Count != SectorCount * Volume->BytesPerSector) { TRACE("FatReadVolumeSectors() Failed to read\n"); return FALSE;

3 days, 16 hours

[reactos] 01/01: [SHELL32] Store target FS attributes in .lnk header (#7302)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bad0dd599179eb7212749… commit bad0dd599179eb7212749a0aaae1275fd20b570f Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Sep 12 19:28:15 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 12 19:28:15 2024 +0200 [SHELL32] Store target FS attributes in .lnk header (#7302) --- dll/win32/shell32/CShellLink.cpp | 44 ++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index ca1f6b1a3ef..d438fa204ff 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -882,6 +882,21 @@ HRESULT STDMETHODCALLTYPE CShellLink::Save(IStream *stm, BOOL fClearDirty) m_Header.dwSize = sizeof(m_Header); m_Header.clsid = CLSID_ShellLink; + /* Store target attributes */ + WIN32_FIND_DATAW wfd = {}; + WCHAR FsTarget[MAX_PATH]; + if (GetPath(FsTarget, _countof(FsTarget), NULL, 0) == S_OK && PathFileExistsW(FsTarget)) + { + HANDLE hFind = FindFirstFileW(FsTarget, &wfd); + if (hFind != INVALID_HANDLE_VALUE) + FindClose(hFind); + } + m_Header.dwFileAttributes = wfd.dwFileAttributes; + m_Header.ftCreationTime = wfd.ftCreationTime; + m_Header.ftLastAccessTime = wfd.ftLastAccessTime; + m_Header.ftLastWriteTime = wfd.ftLastWriteTime; + m_Header.nFileSizeLow = wfd.nFileSizeLow; + /* * Reset the flags: keep only the flags related to data blocks as they were * already set in accordance by the different mutator member functions. @@ -1077,7 +1092,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetPath(LPSTR pszFile, INT cchMaxPath, WIN this, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(m_sPath)); /* Allocate a temporary UNICODE buffer */ - pszFileW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, cchMaxPath * sizeof(WCHAR)); + pszFileW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, max(cchMaxPath, MAX_PATH) * sizeof(WCHAR)); if (!pszFileW) return E_OUTOFMEMORY; @@ -2690,31 +2705,24 @@ INT_PTR CALLBACK ExtendedShortcutProc(HWND hwndDlg, UINT uMsg, return FALSE; } -/************************************************************************** -* SH_GetTargetTypeByPath -* -* Function to get target type by passing full path to it -*/ -void SH_GetTargetTypeByPath(LPCWSTR lpcwFullPath, LPWSTR szBuf, UINT cchBuf) +static void GetTypeDescriptionByPath(PCWSTR pszFullPath, DWORD fAttributes, PWSTR szBuf, UINT cchBuf) { - LPCWSTR pwszExt; - BOOL fFolderTarget = PathIsDirectoryW(lpcwFullPath); - DWORD fAttribs = fFolderTarget ? FILE_ATTRIBUTE_DIRECTORY : 0; + if (fAttributes == INVALID_FILE_ATTRIBUTES && !PathFileExistsAndAttributesW(pszFullPath, &fAttributes)) + fAttributes = 0; - /* Get file information */ SHFILEINFOW fi; - if (!SHGetFileInfoW(lpcwFullPath, fAttribs, &fi, sizeof(fi), SHGFI_TYPENAME | SHGFI_USEFILEATTRIBUTES)) + if (!SHGetFileInfoW(pszFullPath, fAttributes, &fi, sizeof(fi), SHGFI_TYPENAME | SHGFI_USEFILEATTRIBUTES)) { - ERR("SHGetFileInfoW failed for %ls (%lu)\n", lpcwFullPath, GetLastError()); - fi.szTypeName[0] = L'\0'; - fi.hIcon = NULL; + ERR("SHGetFileInfoW failed for %ls (%lu)\n", pszFullPath, GetLastError()); + fi.szTypeName[0] = UNICODE_NULL; } - pwszExt = fFolderTarget ? L"" : PathFindExtensionW(lpcwFullPath); + BOOL fFolder = (fAttributes & FILE_ATTRIBUTE_DIRECTORY); + LPCWSTR pwszExt = fFolder ? L"" : PathFindExtensionW(pszFullPath); if (pwszExt[0]) { if (!fi.szTypeName[0]) - StringCchPrintfW(szBuf, cchBuf,L"%s ", pwszExt + 1); + StringCchPrintfW(szBuf, cchBuf, L"%s", pwszExt + 1); else StringCchPrintfW(szBuf, cchBuf, L"%s (%s)", fi.szTypeName, pwszExt); } @@ -2764,7 +2772,7 @@ BOOL CShellLink::OnInitDialog(HWND hwndDlg, HWND hwndFocus, LPARAM lParam) if (m_sPath) { WCHAR buf[MAX_PATH]; - SH_GetTargetTypeByPath(m_sPath, buf, _countof(buf)); + GetTypeDescriptionByPath(m_sPath, m_Header.dwFileAttributes, buf, _countof(buf)); SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_TYPE_EDIT, buf); }

4 days, 2 hours

[reactos] 06/06: [KMTESTS:SE] Fix failing tests.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44bdafa17e2b870c570ea… commit 44bdafa17e2b870c570ea15f3bdb56decfd7aaa5 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat May 27 22:37:47 2023 -0400 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 12 17:44:13 2024 +0300 [KMTESTS:SE] Fix failing tests. --- modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c b/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c index f58bbc3b17e..950cb78e35c 100644 --- a/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c +++ b/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c @@ -328,6 +328,10 @@ START_TEST(SeQueryInfoToken) // Testing SeFreePrivileges // //----------------------------------------------------------------// + // FIXME: KernelMode will automatically get all access granted without + // getting Privileges filled in. For UserMode, Privileges will only get + // filled if either WRITE_OWNER or ACCESS_SYSTEM_SECURITY is requested + // and granted. So this doesn't really test SeFreePrivileges. Privileges = NULL; Checker = SeAccessCheck( AccessState->SecurityDescriptor, @@ -342,7 +346,7 @@ START_TEST(SeQueryInfoToken) &Status ); ok(Checker, "Checker is NULL\n"); - ok((Privileges != NULL), "Privileges is NULL\n"); + ok(Privileges == NULL, "Privileges is not NULL\n"); if (Privileges) { trace("AuxData->PrivilegesUsed->PrivilegeCount = %d ; Privileges->PrivilegeCount = %d\n", @@ -390,6 +394,8 @@ START_TEST(SeQueryInfoToken) // Call SeFreePrivileges again + // FIXME: See other SeAccessCheck call above, we're not really testing + // SeFreePrivileges here. Privileges = NULL; Checker = SeAccessCheck( AccessState->SecurityDescriptor, @@ -404,7 +410,7 @@ START_TEST(SeQueryInfoToken) &Status ); ok(Checker, "Checker is NULL\n"); - ok((Privileges != NULL), "Privileges is NULL\n"); + ok(Privileges == NULL, "Privileges is not NULL\n"); if (Privileges) { trace("AuxData->PrivilegesUsed->PrivilegeCount = %d ; Privileges->PrivilegeCount = %d\n",

4 days, 5 hours

[reactos] 05/06: [NTOS:SE] Mark output parameters as such.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf6af0f52eba23b2ca667… commit bf6af0f52eba23b2ca6677813792baa80c6d1f82 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat May 27 22:29:16 2023 -0400 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 12 17:44:13 2024 +0300 [NTOS:SE] Mark output parameters as such. --- ntoskrnl/se/access.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/se/access.c b/ntoskrnl/se/access.c index d1ecd5bd571..7a9eedeba66 100644 --- a/ntoskrnl/se/access.c +++ b/ntoskrnl/se/access.c @@ -23,10 +23,10 @@ * @param[in] Process * Valid process object where subject context is to be captured. * - * @param[in,out] AccessState + * @param[out] AccessState * An initialized returned parameter to an access state. * - * @param[in] AuxData + * @param[out] AuxData * Auxiliary security data for access state. * * @param[in] Access @@ -43,8 +43,8 @@ NTAPI SeCreateAccessStateEx( _In_ PETHREAD Thread, _In_ PEPROCESS Process, - _Inout_ PACCESS_STATE AccessState, - _In_ PAUX_ACCESS_DATA AuxData, + _Out_ PACCESS_STATE AccessState, + _Out_ __drv_aliasesMem PAUX_ACCESS_DATA AuxData, _In_ ACCESS_MASK Access, _In_ PGENERIC_MAPPING GenericMapping) { @@ -101,10 +101,10 @@ SeCreateAccessStateEx( * @brief * Creates an access state. * - * @param[in,out] AccessState + * @param[out] AccessState * An initialized returned parameter to an access state. * - * @param[in] AuxData + * @param[out] AuxData * Auxiliary security data for access state. * * @param[in] Access @@ -119,8 +119,8 @@ SeCreateAccessStateEx( NTSTATUS NTAPI SeCreateAccessState( - _Inout_ PACCESS_STATE AccessState, - _In_ PAUX_ACCESS_DATA AuxData, + _Out_ PACCESS_STATE AccessState, + _Out_ __drv_aliasesMem PAUX_ACCESS_DATA AuxData, _In_ ACCESS_MASK Access, _In_ PGENERIC_MAPPING GenericMapping) {

4 days, 5 hours

[reactos] 04/06: [NDK] Match AUX_ACCESS_DATA definition with publicly available version.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=156053cafd3d325ac5d6e… commit 156053cafd3d325ac5d6e6c341dae55bbb99b88c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat May 27 18:24:29 2023 -0400 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 12 17:44:13 2024 +0300 [NDK] Match AUX_ACCESS_DATA definition with publicly available version. Looks like public symbols contain this structure starting with Win7, so we can deduce what it looked like in Win2003. Note that our previous definition was missing a second ULONG at the end, which can be seen in the SeQueryInfoToken kmtest -- if you allocated only sizeof(AUX_ACCESS_DATA), the test would crash with a 4 byte buffer overflow. --- .../rostests/kmtests/ntos_se/SeQueryInfoToken.c | 32 +++++++++++----------- ntoskrnl/ob/obhandle.c | 6 ++-- ntoskrnl/se/access.c | 4 +-- ntoskrnl/se/priv.c | 14 +++++----- sdk/include/ndk/setypes.h | 19 +++++++++++-- 5 files changed, 45 insertions(+), 30 deletions(-) diff --git a/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c b/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c index 2ddf864d086..f58bbc3b17e 100644 --- a/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c +++ b/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c @@ -279,7 +279,7 @@ START_TEST(SeQueryInfoToken) // Testing SeAppendPrivileges // //----------------------------------------------------------------// - InitialPrivilegeCount = AuxData->PrivilegeSet->PrivilegeCount; + InitialPrivilegeCount = AuxData->PrivilegesUsed->PrivilegeCount; trace("Initial privilege count = %lu\n", InitialPrivilegeCount); // Testing SeAppendPrivileges. Must change PrivilegeCount to 2 (1 + 1) @@ -291,7 +291,7 @@ START_TEST(SeQueryInfoToken) Status = SeAppendPrivileges(AccessState, NewPrivilegeSet); ok(Status == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); - ok_eq_ulong(AuxData->PrivilegeSet->PrivilegeCount, InitialPrivilegeCount + 1); + ok_eq_ulong(AuxData->PrivilegesUsed->PrivilegeCount, InitialPrivilegeCount + 1); ExFreePoolWithTag(NewPrivilegeSet, 'QSmK'); //----------------------------------------------------------------// @@ -305,7 +305,7 @@ START_TEST(SeQueryInfoToken) Status = SeAppendPrivileges(AccessState, NewPrivilegeSet); ok(Status == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); - ok_eq_ulong(AuxData->PrivilegeSet->PrivilegeCount, InitialPrivilegeCount + 5); + ok_eq_ulong(AuxData->PrivilegesUsed->PrivilegeCount, InitialPrivilegeCount + 5); ExFreePoolWithTag(NewPrivilegeSet, 'QSmK'); //----------------------------------------------------------------// @@ -313,14 +313,14 @@ START_TEST(SeQueryInfoToken) //----------------------------------------------------------------// // KPROCESSOR_MODE is set to KernelMode ===> Always return TRUE - ok(SePrivilegeCheck(AuxData->PrivilegeSet, &(AccessState->SubjectSecurityContext), KernelMode), "SePrivilegeCheck failed with KernelMode mode arg\n"); + ok(SePrivilegeCheck(AuxData->PrivilegesUsed, &(AccessState->SubjectSecurityContext), KernelMode), "SePrivilegeCheck failed with KernelMode mode arg\n"); // and call it again - ok(SePrivilegeCheck(AuxData->PrivilegeSet, &(AccessState->SubjectSecurityContext), KernelMode), "SePrivilegeCheck failed with KernelMode mode arg\n"); + ok(SePrivilegeCheck(AuxData->PrivilegesUsed, &(AccessState->SubjectSecurityContext), KernelMode), "SePrivilegeCheck failed with KernelMode mode arg\n"); //----------------------------------------------------------------// // KPROCESSOR_MODE is set to UserMode. Expect false - ok(!SePrivilegeCheck(AuxData->PrivilegeSet, &(AccessState->SubjectSecurityContext), UserMode), "SePrivilegeCheck unexpected success with UserMode arg\n"); + ok(!SePrivilegeCheck(AuxData->PrivilegesUsed, &(AccessState->SubjectSecurityContext), UserMode), "SePrivilegeCheck unexpected success with UserMode arg\n"); //----------------------------------------------------------------// @@ -345,8 +345,8 @@ START_TEST(SeQueryInfoToken) ok((Privileges != NULL), "Privileges is NULL\n"); if (Privileges) { - trace("AuxData->PrivilegeSet->PrivilegeCount = %d ; Privileges->PrivilegeCount = %d\n", - AuxData->PrivilegeSet->PrivilegeCount, Privileges->PrivilegeCount); + trace("AuxData->PrivilegesUsed->PrivilegeCount = %d ; Privileges->PrivilegeCount = %d\n", + AuxData->PrivilegesUsed->PrivilegeCount, Privileges->PrivilegeCount); } if (Privileges) SeFreePrivileges(Privileges); @@ -375,16 +375,16 @@ START_TEST(SeQueryInfoToken) NewPrivilegeSet->PrivilegeCount = 14; ok((SeAppendPrivileges(AccessState, NewPrivilegeSet)) == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); - ok_eq_ulong(AuxData->PrivilegeSet->PrivilegeCount, InitialPrivilegeCount + 19); + ok_eq_ulong(AuxData->PrivilegesUsed->PrivilegeCount, InitialPrivilegeCount + 19); ExFreePoolWithTag(NewPrivilegeSet, 'QSmK'); - for (i = 0; i < AuxData->PrivilegeSet->PrivilegeCount; i++) + for (i = 0; i < AuxData->PrivilegesUsed->PrivilegeCount; i++) { - AuxData->PrivilegeSet->Privilege[i].Attributes = TPrivileges->Privileges[i].Attributes; - AuxData->PrivilegeSet->Privilege[i].Luid = TPrivileges->Privileges[i].Luid; + AuxData->PrivilegesUsed->Privilege[i].Attributes = TPrivileges->Privileges[i].Attributes; + AuxData->PrivilegesUsed->Privilege[i].Luid = TPrivileges->Privileges[i].Luid; } - //trace("AccessState->privCount = %u\n\n", ((PAUX_ACCESS_DATA)(AccessState->AuxData))->PrivilegeSet->PrivilegeCount); + //trace("AccessState->privCount = %u\n\n", ((PAUX_ACCESS_DATA)(AccessState->AuxData))->PrivilegesUsed->PrivilegeCount); - ok(SePrivilegeCheck(AuxData->PrivilegeSet, &(AccessState->SubjectSecurityContext), UserMode), "SePrivilegeCheck fails in UserMode, but I wish it will success\n"); + ok(SePrivilegeCheck(AuxData->PrivilegesUsed, &(AccessState->SubjectSecurityContext), UserMode), "SePrivilegeCheck fails in UserMode, but I wish it will success\n"); } } @@ -407,8 +407,8 @@ START_TEST(SeQueryInfoToken) ok((Privileges != NULL), "Privileges is NULL\n"); if (Privileges) { - trace("AuxData->PrivilegeSet->PrivilegeCount = %d ; Privileges->PrivilegeCount = %d\n", - AuxData->PrivilegeSet->PrivilegeCount, Privileges->PrivilegeCount); + trace("AuxData->PrivilegesUsed->PrivilegeCount = %d ; Privileges->PrivilegeCount = %d\n", + AuxData->PrivilegesUsed->PrivilegeCount, Privileges->PrivilegeCount); } if (Privileges) SeFreePrivileges(Privileges); diff --git a/ntoskrnl/ob/obhandle.c b/ntoskrnl/ob/obhandle.c index 28a2fc77e36..530e32fbfaf 100644 --- a/ntoskrnl/ob/obhandle.c +++ b/ntoskrnl/ob/obhandle.c @@ -1647,8 +1647,8 @@ ObpCreateHandle(IN OB_OPEN_REASON OpenReason, if (OpenReason == ObCreateHandle) { /* Check if we need to audit the privileges */ - if ((AuxData->PrivilegeSet) && - (AuxData->PrivilegeSet->PrivilegeCount)) + if ((AuxData->PrivilegesUsed) && + (AuxData->PrivilegesUsed->PrivilegeCount)) { /* Do the audit */ #if 0 @@ -1656,7 +1656,7 @@ ObpCreateHandle(IN OB_OPEN_REASON OpenReason, &AccessState-> SubjectSecurityContext, GrantedAccess, - AuxData->PrivilegeSet, + AuxData->PrivilegesUsed, TRUE, ExGetPreviousMode()); #endif diff --git a/ntoskrnl/se/access.c b/ntoskrnl/se/access.c index d9eacc550c7..d1ecd5bd571 100644 --- a/ntoskrnl/se/access.c +++ b/ntoskrnl/se/access.c @@ -88,7 +88,7 @@ SeCreateAccessStateEx( } /* Set the Auxiliary Data */ - AuxData->PrivilegeSet = (PPRIVILEGE_SET)((ULONG_PTR)AccessState + + AuxData->PrivilegesUsed = (PPRIVILEGE_SET)((ULONG_PTR)AccessState + FIELD_OFFSET(ACCESS_STATE, Privileges)); if (GenericMapping) AuxData->GenericMapping = *GenericMapping; @@ -158,7 +158,7 @@ SeDeleteAccessState( /* Deallocate Privileges */ if (AccessState->PrivilegesAllocated) - ExFreePoolWithTag(AuxData->PrivilegeSet, TAG_PRIVILEGE_SET); + ExFreePoolWithTag(AuxData->PrivilegesUsed, TAG_PRIVILEGE_SET); /* Deallocate Name and Type Name */ if (AccessState->ObjectName.Buffer) diff --git a/ntoskrnl/se/priv.c b/ntoskrnl/se/priv.c index a147d2bd2b7..c7f284d293d 100644 --- a/ntoskrnl/se/priv.c +++ b/ntoskrnl/se/priv.c @@ -601,9 +601,9 @@ SeAppendPrivileges( /* Calculate the size of the old privilege set */ OldPrivilegeSetSize = sizeof(PRIVILEGE_SET) + - (AuxData->PrivilegeSet->PrivilegeCount - 1) * sizeof(LUID_AND_ATTRIBUTES); + (AuxData->PrivilegesUsed->PrivilegeCount - 1) * sizeof(LUID_AND_ATTRIBUTES); - if (AuxData->PrivilegeSet->PrivilegeCount + + if (AuxData->PrivilegesUsed->PrivilegeCount + Privileges->PrivilegeCount > INITIAL_PRIVILEGE_COUNT) { /* Calculate the size of the new privilege set */ @@ -619,7 +619,7 @@ SeAppendPrivileges( /* Copy original privileges from the acess state */ RtlCopyMemory(PrivilegeSet, - AuxData->PrivilegeSet, + AuxData->PrivilegesUsed, OldPrivilegeSetSize); /* Append privileges from the privilege set*/ @@ -632,23 +632,23 @@ SeAppendPrivileges( /* Free the old privilege set if it was allocated */ if (AccessState->PrivilegesAllocated != FALSE) - ExFreePoolWithTag(AuxData->PrivilegeSet, TAG_PRIVILEGE_SET); + ExFreePoolWithTag(AuxData->PrivilegesUsed, TAG_PRIVILEGE_SET); /* Now we are using an allocated privilege set */ AccessState->PrivilegesAllocated = TRUE; /* Assign the new privileges to the access state */ - AuxData->PrivilegeSet = PrivilegeSet; + AuxData->PrivilegesUsed = PrivilegeSet; } else { /* Append privileges */ - RtlCopyMemory((PVOID)((ULONG_PTR)AuxData->PrivilegeSet + OldPrivilegeSetSize), + RtlCopyMemory((PVOID)((ULONG_PTR)AuxData->PrivilegesUsed + OldPrivilegeSetSize), (PVOID)((ULONG_PTR)Privileges + sizeof(PRIVILEGE_SET) - sizeof(LUID_AND_ATTRIBUTES)), Privileges->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); /* Adjust the number of privileges in the target privilege set */ - AuxData->PrivilegeSet->PrivilegeCount += Privileges->PrivilegeCount; + AuxData->PrivilegesUsed->PrivilegeCount += Privileges->PrivilegeCount; } return STATUS_SUCCESS; diff --git a/sdk/include/ndk/setypes.h b/sdk/include/ndk/setypes.h index 1f54e097318..d9fe4c4f9b6 100644 --- a/sdk/include/ndk/setypes.h +++ b/sdk/include/ndk/setypes.h @@ -255,9 +255,24 @@ typedef struct _TOKEN typedef struct _AUX_ACCESS_DATA { - PPRIVILEGE_SET PrivilegeSet; + PPRIVILEGE_SET PrivilegesUsed; GENERIC_MAPPING GenericMapping; - ULONG Reserved; + ACCESS_MASK AccessesToAudit; + ACCESS_MASK MaximumAuditMask; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + GUID TransactionId; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN7) + PVOID NewSecurityDescriptor; + PVOID ExistingSecurityDescriptor; + PVOID ParentSecurityDescriptor; + VOID (NTAPI *DerefSecurityDescriptor)(PVOID, PVOID); + PVOID SDLock; + ACCESS_REASONS AccessReasons; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN8) + BOOLEAN GenerateStagingEvents; +#endif } AUX_ACCESS_DATA, *PAUX_ACCESS_DATA; //

4 days, 5 hours

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs