[FONTEXT] Cache attributes, handle sorting

Author: learn-more

dll/shellext/fontext/CDataObject.cpp

@@ -2,7 +2,7 @@
  * PROJECT:     ReactOS Font Shell Extension
  * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     CFontMenu implementation
- * COPYRIGHT:   Copyright 2019,2020 Mark Jansen ([email protected])
+ * COPYRIGHT:   Copyright 2019-2021 Mark Jansen <[email protected]>
  */
 
 #include "precomp.h"
@@ -58,7 +58,7 @@ HRESULT _CDataObject_CreateInstance(PCIDLIST_ABSOLUTE folder, UINT cidl, PCUITEM
         const FontPidlEntry* fontEntry = _FontFromIL(apidl[n]);
         if (fontEntry)
         {
-            CStringW File = g_FontCache->Filename(fontEntry, true);
+            CStringW File = g_FontCache->Filename(g_FontCache->Find(fontEntry), true);
             if (!File.IsEmpty())
             {
                 // Now append the path (+ nullterminator) to the buffer
@@ -94,36 +94,8 @@ HRESULT _CDataObject_CreateInstance(PCIDLIST_ABSOLUTE folder, UINT cidl, PCUITEM
     pDrop->pt.x = pDrop->pt.y = 0;
     pDrop-> fNC = NULL;
 
-    // Prepare the format descriptors
-    STGMEDIUM medium = {0};
-    medium.tymed = TYMED_HGLOBAL;
-
-    // Copy the data to an HGLOBAL
-    medium.hGlobal = GlobalAlloc(GHND, offset);
-    if (medium.hGlobal)
-    {
-        LPVOID blob = GlobalLock(medium.hGlobal);
-        if (blob)
-        {
-            CopyMemory(blob, (BYTE*)data, offset);
-            GlobalUnlock(medium.hGlobal);
-
-            CComPtr<IDataObject> spDataObject(*(IDataObject**)ppvOut);
-            if (spDataObject)
-            {
-                FORMATETC etc = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-                hr = spDataObject->SetData(&etc, &medium, TRUE);
-            }
-        }
-        else
-        {
-            ERR("Unable to lock the hGlobal?!\n");
-        }
-    }
-    else
-    {
-        ERR("Unable to allocate %u bytes for the hGlobal\n", offset);
-    }
+    hr = DataObject_SetData(*(IDataObject**)ppvOut, CF_HDROP, data, offset);
+    FAILED_UNEXPECTEDLY(hr);
 
     return hr;
 }

dll/shellext/fontext/CEnumFonts.cpp

@@ -2,7 +2,7 @@
  * PROJECT:     ReactOS Font Shell Extension
  * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     CEnumFonts implementation
- * COPYRIGHT:   Copyright 2019 Mark Jansen ([email protected])
+ * COPYRIGHT:   Copyright 2019 Mark Jansen <[email protected]>
  */
 
 #include "precomp.h"

dll/shellext/fontext/CFontCache.cpp

@@ -2,7 +2,7 @@
  * PROJECT:     ReactOS Font Shell Extension
  * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     font list cache handling
- * COPYRIGHT:   Copyright 2019,2020 Mark Jansen ([email protected])
+ * COPYRIGHT:   Copyright 2019-2021 Mark Jansen <[email protected]>
  */
 
 #include "precomp.h"
@@ -14,7 +14,11 @@ CFontCache* g_FontCache = NULL;
 CFontInfo::CFontInfo(LPCWSTR name)
     : m_Name(name)
     , m_FileRead(false)
+    , m_AttrsRead(false)
+    , m_FileWriteTime({})
+    , m_dwFileAttributes(0)
 {
+    m_FileSize.QuadPart = 0;
 }
 
 const CStringW& CFontInfo::Name() const
@@ -62,7 +66,52 @@ const CStringW& CFontInfo::File()
     return m_File;
 }
 
+void CFontInfo::ReadAttrs()
+{
+    CStringW File = g_FontCache->Filename(this, true);
+
+    m_AttrsRead = true;
+
+    WIN32_FIND_DATAW findFileData;
+    HANDLE hFile = FindFirstFileW(File, &findFileData);
+    if (hFile != INVALID_HANDLE_VALUE)
+    {
+
+        // File write time
+        FileTimeToLocalFileTime(&findFileData.ftLastWriteTime, &m_FileWriteTime);
+
+        // File size
+        m_FileSize.HighPart = findFileData.nFileSizeHigh;
+        m_FileSize.LowPart = findFileData.nFileSizeLow;
+
+        m_dwFileAttributes = findFileData.dwFileAttributes;
+        FindClose(hFile);
+    }
+}
+
+const LARGE_INTEGER& CFontInfo::FileSize()
+{
+    if (!m_AttrsRead)
+        ReadAttrs();
+
+    return m_FileSize;
+}
+
+const FILETIME& CFontInfo::FileWriteTime()
+{
+    if (!m_AttrsRead)
+        ReadAttrs();
+
+    return m_FileWriteTime;
+}
+
+DWORD CFontInfo::FileAttributes()
+{
+    if (!m_AttrsRead)
+        ReadAttrs();
 
+    return m_dwFileAttributes;
+}
 
 CFontCache::CFontCache()
 {
@@ -93,30 +142,39 @@ CStringW CFontCache::Name(size_t Index)
     return m_Fonts[Index].Name();
 }
 
-CStringW CFontCache::Filename(const FontPidlEntry* fontEntry, bool alwaysFullPath)
+CFontInfo* CFontCache::Find(const FontPidlEntry* fontEntry)
 {
-    CStringW File;
-
     if (fontEntry->Index < m_Fonts.GetCount())
     {
-        CFontInfo& info = m_Fonts[fontEntry->Index];
-
-        if (info.Name().CompareNoCase(fontEntry->Name) == 0)
-            File = info.File();
+        if (m_Fonts[fontEntry->Index].Name().CompareNoCase(fontEntry->Name) == 0)
+            return &m_Fonts[fontEntry->Index];
     }
 
-    for (UINT n = 0; File.IsEmpty() && n < Size(); ++n)
+    for (UINT n = 0; n < Size(); ++n)
     {
         if (m_Fonts[n].Name().CompareNoCase(fontEntry->Name) == 0)
-            File = m_Fonts[n].File();
+        {
+            return &m_Fonts[n];
+        }
     }
+    return nullptr;
+}
 
-    if (!File.IsEmpty() && alwaysFullPath)
+
+CStringW CFontCache::Filename(CFontInfo* info, bool alwaysFullPath)
+{
+    CStringW File;
+    if (info)
     {
-        // Ensure this is a full path
-        if (PathIsRelativeW(File))
+        File = info->File();
+
+        if (!File.IsEmpty() && alwaysFullPath)
         {
-            File = m_FontFolderPath + File;
+            // Ensure this is a full path
+            if (PathIsRelativeW(File))
+            {
+                File = m_FontFolderPath + File;
+            }
         }
     }
 

dll/shellext/fontext/CFontCache.hpp

@@ -2,7 +2,7 @@
  * PROJECT:     ReactOS Font Shell Extension
  * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     font list cache handling
- * COPYRIGHT:   Copyright 2019,2020 Mark Jansen ([email protected])
+ * COPYRIGHT:   Copyright 2019-2021 Mark Jansen <[email protected]>
  */
 
 #pragma once
@@ -14,12 +14,24 @@ class CFontInfo
     CStringW m_Name;
     CStringW m_File;
     bool m_FileRead;
+
+    bool m_AttrsRead;
+    LARGE_INTEGER m_FileSize;
+    FILETIME m_FileWriteTime;
+    DWORD m_dwFileAttributes;
+
+    void ReadAttrs();
+
 public:
     CFontInfo(LPCWSTR name = L"");
 
-    const CStringW& Name() const;
-    const CStringW& File();
+    const CStringW& Name() const;   // Font display name stored in the registry
     const bool Valid() const;
+
+    const CStringW& File();         // Full path or file, depending on how it's stored in the registry
+    const LARGE_INTEGER& FileSize();
+    const FILETIME& FileWriteTime();
+    DWORD FileAttributes();
 };
 
 
@@ -40,8 +52,10 @@ class CFontCache
     const CStringW& FontPath() const { return m_FontFolderPath; }
 
     size_t Size();
-    CStringW Name(size_t Index);
-    CStringW Filename(const FontPidlEntry* fontEntry, bool alwaysFullPath = false);
+    CStringW Name(size_t Index);    // Font display name stored in the registry
+
+    CFontInfo* Find(const FontPidlEntry* fontEntry);
+    CStringW Filename(CFontInfo* info, bool alwaysFullPath = false);
 
     friend class CFontExtModule;
 };