[ros-diffs] [janderwald] 35194: * fully implement enumeration of details for virtual font shell folder

Author: janderwald
Date: Fri Aug  8 14:15:27 2008
New Revision: 35194

URL: http://svn.reactos.org/svn/reactos?rev=35194&view=rev
Log:
* fully implement enumeration of details for virtual font shell folder

Modified:
    trunk/reactos/dll/win32/shell32/shfldr_fonts.c

Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Fri Aug  8 14:15:27 2008
@@ -217,7 +217,7 @@
     tmp.u.cfont.dummy = 0xFF;
     tmp.u.cfont.offsFile = wcslen(pszFont) + 1;
 
-    size = (tmp.u.cfont.offsFile + wcslen(pszFile) + 1) * sizeof(WCHAR);
+    size += (tmp.u.cfont.offsFile + wcslen(pszFile) + 1) * sizeof(WCHAR);
 
     pidl = (LPITEMIDLIST)SHAlloc(size + 4);
     if (!pidl)
@@ -639,6 +639,7 @@
     PIDLFontStruct * pfont;
     HANDLE hFile;
     LARGE_INTEGER FileSize;
+    SHFILEINFOW fi;
 
     TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, psd);
 
@@ -668,13 +669,26 @@
     switch(iColumn)
     {
         case COLUMN_TYPE:
+            pfont = _ILGetFontStruct(pidl);
+            if (pfont)
+            {
+                if (SHGetFileInfoW(pfont->szName + pfont->offsFile, 0, &fi,
sizeof(fi), SHGFI_TYPENAME))
+                {
+                    psd->str.u.pOleStr = CoTaskMemAlloc((wcslen(fi.szTypeName)+1) *
sizeof(WCHAR));
+                    if (!psd->str.u.pOleStr)
+                        return E_OUTOFMEMORY;
+                    wcscpy(psd->str.u.pOleStr, fi.szTypeName);
+                    psd->str.uType = STRRET_WSTR;
+                    return S_OK;
+                }
+            }
             break;
         case COLUMN_SIZE:
             pfont = _ILGetFontStruct(pidl);
             if (pfont)
             {
-                hFile = CreateFileW(pfont->szName + pfont->offsFile, GENERIC_READ,
0, NULL, OPEN_EXISTING, 0, NULL);
-                if (hFile)
+                hFile = CreateFileW(pfont->szName + pfont->offsFile, GENERIC_READ,
FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+                if (hFile != INVALID_HANDLE_VALUE)
                 {
                     if (GetFileSizeEx(hFile, &FileSize))
                     {