Changeset 2858 for trunk/src/lib/nt

Timestamp:

Sep 1, 2016, 5:12:24 PM (9 years ago)

Author:

bird

Message:

updates

Location:

trunk/src/lib/nt

Files:

• kFsCache.c (modified) (8 diffs)
• kFsCache.h (modified) (1 diff)
• ntstat.c (modified) (6 diffs)
• ntstat.h (modified) (1 diff)
• ntstuff.h (modified) (1 diff)

trunk/src/lib/nt/kFsCache.c

@@ -2220 +2220 @@
  *
  * @returns Reference to object corresponding to @a pszPath on success, this
- *          must be released by kwFsCacheRelease.
+ *          must be released by kFsCacheObjRelease.
  *          NULL if not a path we care to cache.
  * @param   pCache              The cache.
@@ -2246 +2246 @@
             {
                 if (   pHashEntry->uCacheGen == KFSOBJ_CACHE_GEN_IGNORE
-                    || pHashEntry->uCacheGen == pCache->uGeneration
+                    || pHashEntry->uCacheGen == (pHashEntry->pFsObj ? pCache->uGeneration : pCache->uGenerationMissing)
                     || (pHashEntry = kFsCacheRefreshPathA(pCache, pHashEntry, idxHashTab)) )
                 {
@@ -2310 +2310 @@
  *
  * @returns Reference to object corresponding to @a pszPath on success, this
- *          must be released by kwFsCacheRelease.
+ *          must be released by kFsCacheObjRelease.
  *          NULL if not a path we care to cache.
  * @param   pCache              The cache.
@@ -2336 +2336 @@
             {
                 if (   pHashEntry->uCacheGen == KFSOBJ_CACHE_GEN_IGNORE
-                    || pHashEntry->uCacheGen == pCache->uGeneration
+                    || pHashEntry->uCacheGen == (pHashEntry->pFsObj ? pCache->uGeneration : pCache->uGenerationMissing)
                     || (pHashEntry = kFsCacheRefreshPathW(pCache, pHashEntry, idxHashTab)) )
                 {
@@ -2390 +2390 @@
 
 /**
+ * Wrapper around kFsCacheLookupA that drops KFSOBJ_TYPE_MISSING and returns
+ * KFSLOOKUPERROR_NOT_FOUND instead.
+ *
+ * @returns Reference to object corresponding to @a pszPath on success, this
+ *          must be released by kFsCacheObjRelease.
+ *          NULL if not a path we care to cache.
+ * @param   pCache              The cache.
+ * @param   pszPath             The path to lookup.
+ * @param   penmError           Where to return details as to why the lookup
+ *                              failed.
+ */
+PKFSOBJ kFsCacheLookupNoMissingA(PKFSCACHE pCache, const char *pszPath, KFSLOOKUPERROR *penmError)
+{
+    PKFSOBJ pObj = kFsCacheLookupA(pCache, pszPath, penmError);
+    if (pObj)
+    {
+        if (pObj->bObjType != KFSOBJ_TYPE_MISSING)
+            return pObj;
+
+        kFsCacheObjRelease(pCache, pObj);
+        *penmError = KFSLOOKUPERROR_NOT_FOUND;
+    }
+    return NULL;
+}
+
+
+/**
+ * Wrapper around kFsCacheLookupW that drops KFSOBJ_TYPE_MISSING and returns
+ * KFSLOOKUPERROR_NOT_FOUND instead.
+ *
+ * @returns Reference to object corresponding to @a pszPath on success, this
+ *          must be released by kFsCacheObjRelease.
+ *          NULL if not a path we care to cache.
+ * @param   pCache              The cache.
+ * @param   pwszPath            The path to lookup.
+ * @param   penmError           Where to return details as to why the lookup
+ *                              failed.
+ */
+PKFSOBJ kFsCacheLookupNoMissingW(PKFSCACHE pCache, const wchar_t *pwszPath, KFSLOOKUPERROR *penmError)
+{
+    PKFSOBJ pObj = kFsCacheLookupW(pCache, pwszPath, penmError);
+    if (pObj)
+    {
+        if (pObj->bObjType != KFSOBJ_TYPE_MISSING)
+            return pObj;
+
+        kFsCacheObjRelease(pCache, pObj);
+        *penmError = KFSLOOKUPERROR_NOT_FOUND;
+    }
+    return NULL;
+}
+
+
+/**
  * Destroys a cache object which has a zero reference count.
  *
@@ -2489 +2543 @@
 KU32 kFsCacheObjRelease(PKFSCACHE pCache, PKFSOBJ pObj)
 {
-    KU32 cRefs;
-    kHlpAssert(pCache->u32Magic == KFSCACHE_MAGIC);
-    kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
-
-    cRefs = --pObj->cRefs;
-    if (cRefs)
-        return cRefs;
-    return kFsCacheObjDestroy(pCache, pObj);
+    if (pObj)
+    {
+        KU32 cRefs;
+        kHlpAssert(pCache->u32Magic == KFSCACHE_MAGIC);
+        kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
+
+        cRefs = --pObj->cRefs;
+        if (cRefs)
+            return cRefs;
+        return kFsCacheObjDestroy(pCache, pObj);
+    }
+    return 0;
 }
 
@@ -2572 +2630 @@
     return NULL;
 }
+
+
+/**
+ * Gets the full path to @a pObj, ANSI version.
+ *
+ * @returns K_TRUE on success, K_FALSE on buffer overflow (nothing stored).
+ * @param   pObj                The object to get the full path to.
+ * @param   pszPath             Where to return the path
+ * @param   cbPath              The size of the output buffer.
+ * @param   chSlash             The slash to use.
+ */
+KBOOL kFsCacheObjGetFullPathA(PKFSOBJ pObj, char *pszPath, KSIZE cbPath, char chSlash)
+{
+    KSIZE off = pObj->cchParent;
+    kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
+    if (off > 0)
+    {
+        KSIZE offEnd = off + pObj->cchName;
+        if (offEnd < cbPath)
+        {
+            PKFSDIR pAncestor;
+
+            pszPath[off + pObj->cchName] = '\0';
+            memcpy(&pszPath[off], pObj->pszName, pObj->cchName);
+
+            for (pAncestor = pObj->pParent; off > 0; pAncestor = pAncestor->Obj.pParent)
+            {
+                kHlpAssert(off > 1);
+                kHlpAssert(pAncestor != NULL);
+                kHlpAssert(pAncestor->Obj.cchName > 0);
+                pszPath[--off] = chSlash;
+                off -= pAncestor->Obj.cchName;
+                kHlpAssert(pAncestor->Obj.cchParent == off);
+                memcpy(&pszPath[off], pAncestor->Obj.pszName, pAncestor->Obj.cchName);
+            }
+            return K_TRUE;
+        }
+    }
+    else
+    {
+        KBOOL const fDriveLetter = pObj->cchName == 2 && pObj->pszName[2] == ':';
+        off = pObj->cchName;
+        if (off + fDriveLetter < cbPath)
+        {
+            memcpy(pszPath, pObj->pszName, off);
+            if (fDriveLetter)
+                pszPath[off++] = chSlash;
+            pszPath[off] = '\0';
+            return K_TRUE;
+        }
+    }
+
+    return K_FALSE;
+}
+
+
+/**
+ * Gets the full path to @a pObj, UTF-16 version.
+ *
+ * @returns K_TRUE on success, K_FALSE on buffer overflow (nothing stored).
+ * @param   pObj                The object to get the full path to.
+ * @param   pszPath             Where to return the path
+ * @param   cbPath              The size of the output buffer.
+ * @param   wcSlash             The slash to use.
+ */
+KBOOL kFsCacheObjGetFullPathW(PKFSOBJ pObj, wchar_t *pwszPath, KSIZE cwcPath, wchar_t wcSlash)
+{
+    KSIZE off = pObj->cwcParent;
+    kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
+    if (off > 0)
+    {
+        KSIZE offEnd = off + pObj->cwcName;
+        if (offEnd < cwcPath)
+        {
+            PKFSDIR pAncestor;
+
+            pwszPath[off + pObj->cwcName] = '\0';
+            memcpy(&pwszPath[off], pObj->pwszName, pObj->cwcName * sizeof(wchar_t));
+
+            for (pAncestor = pObj->pParent; off > 0; pAncestor = pAncestor->Obj.pParent)
+            {
+                kHlpAssert(off > 1);
+                kHlpAssert(pAncestor != NULL);
+                kHlpAssert(pAncestor->Obj.cwcName > 0);
+                pwszPath[--off] = wcSlash;
+                off -= pAncestor->Obj.cwcName;
+                kHlpAssert(pAncestor->Obj.cwcParent == off);
+                memcpy(&pwszPath[off], pAncestor->Obj.pwszName, pAncestor->Obj.cwcName * sizeof(wchar_t));
+            }
+            return K_TRUE;
+        }
+    }
+    else
+    {
+        KBOOL const fDriveLetter = pObj->cchName == 2 && pObj->pszName[2] == ':';
+        off = pObj->cwcName;
+        if (off + fDriveLetter < cwcPath)
+        {
+            memcpy(pwszPath, pObj->pwszName, off * sizeof(wchar_t));
+            if (fDriveLetter)
+                pwszPath[off++] = wcSlash;
+            pwszPath[off] = '\0';
+            return K_TRUE;
+        }
+    }
+
+    return K_FALSE;
+}
+
+
+#ifdef KFSCACHE_CFG_SHORT_NAMES
+
+/**
+ * Gets the full short path to @a pObj, ANSI version.
+ *
+ * @returns K_TRUE on success, K_FALSE on buffer overflow (nothing stored).
+ * @param   pObj                The object to get the full path to.
+ * @param   pszPath             Where to return the path
+ * @param   cbPath              The size of the output buffer.
+ * @param   chSlash             The slash to use.
+ */
+KBOOL kFsCacheObjGetFullShortPathA(PKFSOBJ pObj, char *pszPath, KSIZE cbPath, char chSlash)
+{
+    KSIZE off = pObj->cchShortParent;
+    kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
+    if (off > 0)
+    {
+        KSIZE offEnd = off + pObj->cchShortName;
+        if (offEnd < cbPath)
+        {
+            PKFSDIR pAncestor;
+
+            pszPath[off + pObj->cchShortName] = '\0';
+            memcpy(&pszPath[off], pObj->pszShortName, pObj->cchShortName);
+
+            for (pAncestor = pObj->pParent; off > 0; pAncestor = pAncestor->Obj.pParent)
+            {
+                kHlpAssert(off > 1);
+                kHlpAssert(pAncestor != NULL);
+                kHlpAssert(pAncestor->Obj.cchShortName > 0);
+                pszPath[--off] = chSlash;
+                off -= pAncestor->Obj.cchShortName;
+                kHlpAssert(pAncestor->Obj.cchShortParent == off);
+                memcpy(&pszPath[off], pAncestor->Obj.pszShortName, pAncestor->Obj.cchShortName);
+            }
+            return K_TRUE;
+        }
+    }
+    else
+    {
+        KBOOL const fDriveLetter = pObj->cchShortName == 2 && pObj->pszShortName[2] == ':';
+        off = pObj->cchShortName;
+        if (off + fDriveLetter < cbPath)
+        {
+            memcpy(pszPath, pObj->pszShortName, off);
+            if (fDriveLetter)
+                pszPath[off++] = chSlash;
+            pszPath[off] = '\0';
+            return K_TRUE;
+        }
+    }
+
+    return K_FALSE;
+}
+
+
+/**
+ * Gets the full short path to @a pObj, UTF-16 version.
+ *
+ * @returns K_TRUE on success, K_FALSE on buffer overflow (nothing stored).
+ * @param   pObj                The object to get the full path to.
+ * @param   pszPath             Where to return the path
+ * @param   cbPath              The size of the output buffer.
+ * @param   wcSlash             The slash to use.
+ */
+KBOOL kFsCacheObjGetFullShortPathW(PKFSOBJ pObj, wchar_t *pwszPath, KSIZE cwcPath, wchar_t wcSlash)
+{
+    KSIZE off = pObj->cwcShortParent;
+    kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
+    if (off > 0)
+    {
+        KSIZE offEnd = off + pObj->cwcShortName;
+        if (offEnd < cwcPath)
+        {
+            PKFSDIR pAncestor;
+
+            pwszPath[off + pObj->cwcShortName] = '\0';
+            memcpy(&pwszPath[off], pObj->pwszShortName, pObj->cwcShortName * sizeof(wchar_t));
+
+            for (pAncestor = pObj->pParent; off > 0; pAncestor = pAncestor->Obj.pParent)
+            {
+                kHlpAssert(off > 1);
+                kHlpAssert(pAncestor != NULL);
+                kHlpAssert(pAncestor->Obj.cwcShortName > 0);
+                pwszPath[--off] = wcSlash;
+                off -= pAncestor->Obj.cwcShortName;
+                kHlpAssert(pAncestor->Obj.cwcShortParent == off);
+                memcpy(&pwszPath[off], pAncestor->Obj.pwszShortName, pAncestor->Obj.cwcShortName * sizeof(wchar_t));
+            }
+            return K_TRUE;
+        }
+    }
+    else
+    {
+        KBOOL const fDriveLetter = pObj->cchShortName == 2 && pObj->pszShortName[2] == ':';
+        off = pObj->cwcShortName;
+        if (off + fDriveLetter < cwcPath)
+        {
+            memcpy(pwszPath, pObj->pwszShortName, off * sizeof(wchar_t));
+            if (fDriveLetter)
+                pwszPath[off++] = wcSlash;
+            pwszPath[off] = '\0';
+            return K_TRUE;
+        }
+    }
+
+    return K_FALSE;
+}
+
+#endif /* KFSCACHE_CFG_SHORT_NAMES */
 
 
@@ -2621 +2899 @@
             pCache->fFlags          = fFlags;
             pCache->uGeneration     = 1;
+            pCache->uGenerationMissing = KU32_MAX / 2;
             pCache->cObjects        = 1;
             pCache->cbObjects       = sizeof(pCache->RootDir) + pCache->RootDir.cHashTab * sizeof(pCache->RootDir.paHashTab[0]);

trunk/src/lib/nt/kFsCache.h

@@ -427 +427 @@
 PKFSOBJ     kFsCacheLookupRelativeToDirW(PKFSCACHE pCache, PKFSDIR pParent, const wchar_t *pwszPath, KU32 cwcPath,
                                          KFSLOOKUPERROR *penmError);
+PKFSOBJ     kFsCacheLookupNoMissingA(PKFSCACHE pCache, const char *pszPath, KFSLOOKUPERROR *penmError);
+PKFSOBJ     kFsCacheLookupNoMissingW(PKFSCACHE pCache, const wchar_t *pwszPath, KFSLOOKUPERROR *penmError);
+
 
 KU32        kFsCacheObjRelease(PKFSCACHE pCache, PKFSOBJ pObj);
 KU32        kFsCacheObjRetain(PKFSOBJ pObj);
-PKFSUSERDATA kFsCacheObjAddUserData(PKFSCACHE pCache, PKFSOBJ pPathObj, KUPTR uKey, KSIZE cbUserData);
-PKFSUSERDATA kFsCacheObjGetUserData(PKFSCACHE pCache, PKFSOBJ pPathObj, KUPTR uKey);
+PKFSUSERDATA kFsCacheObjAddUserData(PKFSCACHE pCache, PKFSOBJ pObj, KUPTR uKey, KSIZE cbUserData);
+PKFSUSERDATA kFsCacheObjGetUserData(PKFSCACHE pCache, PKFSOBJ pObj, KUPTR uKey);
+KBOOL       kFsCacheObjGetFullPathA(PKFSOBJ pObj, char *pszPath, KSIZE cbPath, char chSlash);
+KBOOL       kFsCacheObjGetFullPathW(PKFSOBJ pObj, wchar_t *pwszPath, KSIZE cwcPath, wchar_t wcSlash);
+KBOOL       kFsCacheObjGetFullShortPathA(PKFSOBJ pObj, char *pszPath, KSIZE cbPath, char chSlash);
+KBOOL       kFsCacheObjGetFullShortPathW(PKFSOBJ pObj, wchar_t *pwszPath, KSIZE cwcPath, wchar_t wcSlash);
 
 PKFSCACHE   kFsCacheCreate(KU32 fFlags);

trunk/src/lib/nt/ntstat.c

@@ -208 +208 @@
     pStat->st_uid           = 0;
     pStat->st_gid           = 0;
-    pStat->st_padding1[0]   = 0;
-    pStat->st_padding1[1]   = 0;
-    pStat->st_padding1[2]   = 0;
+    pStat->st_padding1      = 0;
+    pStat->st_attribs       = pBuf->FileAttributes;
     pStat->st_blksize       = 65536;
     pStat->st_blocks        = (pBuf->AllocationSize.QuadPart + BIRD_STAT_BLOCK_SIZE - 1)
@@ -241 +240 @@
     pStat->st_uid           = 0;
     pStat->st_gid           = 0;
-    pStat->st_padding1[0]   = 0;
-    pStat->st_padding1[1]   = 0;
-    pStat->st_padding1[2]   = 0;
+    pStat->st_padding1      = 0;
+    pStat->st_attribs       = pBuf->FileAttributes;
     pStat->st_blksize       = 65536;
     pStat->st_blocks        = (pBuf->AllocationSize.QuadPart + BIRD_STAT_BLOCK_SIZE - 1)
@@ -274 +272 @@
     pStat->st_uid           = 0;
     pStat->st_gid           = 0;
-    pStat->st_padding1[0]   = 0;
-    pStat->st_padding1[1]   = 0;
-    pStat->st_padding1[2]   = 0;
+    pStat->st_padding1      = 0;
+    pStat->st_attribs       = pBuf->FileAttributes;
     pStat->st_blksize       = 65536;
     pStat->st_blocks        = (pBuf->AllocationSize.QuadPart + BIRD_STAT_BLOCK_SIZE - 1)
@@ -314 +311 @@
             pStat->st_uid           = 0;
             pStat->st_gid           = 0;
-            pStat->st_padding1[0]   = 0;
-            pStat->st_padding1[1]   = 0;
-            pStat->st_padding1[2]   = 0;
+            pStat->st_padding1      = 0;
+            pStat->st_attribs       = pAll->StandardInformation.FileAttributes;
             pStat->st_blksize       = 65536;
             pStat->st_blocks        = (pAll->StandardInformation.AllocationSize.QuadPart + BIRD_STAT_BLOCK_SIZE - 1)
@@ -389 +385 @@
         pStat->st_uid           = 0;
         pStat->st_gid           = 0;
-        pStat->st_padding1[0]   = 0;
-        pStat->st_padding1[1]   = 0;
-        pStat->st_padding1[2]   = 0;
+        pStat->st_padding1      = 0;
+        pStat->st_attribs       = BasicInfo.FileAttributes;
         pStat->st_blksize       = 65536;
         pStat->st_blocks        = (StdInfo.AllocationSize.QuadPart + BIRD_STAT_BLOCK_SIZE - 1)
@@ -608 +603 @@
                 pStat->st_uid               = 0;
                 pStat->st_gid               = 0;
-                pStat->st_padding1[0]       = 0;
-                pStat->st_padding1[1]       = 0;
-                pStat->st_padding1[2]       = 0;
+                pStat->st_padding1          = 0;
+                pStat->st_attribs           = fFileType == FILE_TYPE_PIPE ? FILE_ATTRIBUTE_NORMAL : FILE_ATTRIBUTE_DEVICE;
                 pStat->st_blksize           = 512;
                 pStat->st_blocks            = 0;

trunk/src/lib/nt/ntstat.h

@@ -63 +63 @@
     __int16             st_uid;
     __int16             st_gid;
-    unsigned __int16    st_padding1[3];
+    unsigned __int16    st_padding1;
+    unsigned __int32    st_attribs;
     unsigned __int32    st_blksize;
     __int64             st_blocks;

trunk/src/lib/nt/ntstuff.h

@@ -36 +36 @@
 #define WIN32_NO_STATUS
 #include <Windows.h>
+#include <winternl.h>
 #undef WIN32_NO_STATUS
 #include <ntstatus.h>