Changeset 113 for trunk/include/helpers/wphandle.h

Timestamp:

Oct 23, 2001, 11:25:46 PM (24 years ago)

Author:

umoeller

Message:

Misc updates.

File:

• trunk/include/helpers/wphandle.h (modified) (6 diffs)

trunk/include/helpers/wphandle.h

@@ -14 +14 @@
  *@@include #define INCL_WINWORKPLACE
  *@@include #include <os2.h>
- *@@include #include "wphandle.h"
+ *@@include #include "helpers\wphandle.h"
  */
 
-/*      This file Copyright (C) 1997-2000 Ulrich M”ller,
- *                                        Henk Kelder.
+/*      This file Copyright (C) 1997-2001 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -51 +50 @@
     #define ERROR_WPH_CORRUPT_HANDLES_DATA          (ERROR_WPH_FIRST +   5)
     #define ERROR_WPH_INVALID_PARENT_HANDLE         (ERROR_WPH_FIRST +   6)
+    #define ERROR_WPH_CANNOT_FIND_HANDLE            (ERROR_WPH_FIRST +   7)
+    #define ERROR_WPH_DRIV_TREEINSERT_FAILED        (ERROR_WPH_FIRST +   8)
+    #define ERROR_WPH_NODE_TREEINSERT_FAILED        (ERROR_WPH_FIRST +   9)
+    #define ERROR_WPH_NODE_BEFORE_DRIV              (ERROR_WPH_FIRST +  10)
+    #define ERROR_WPH_NO_MATCHING_DRIVE_BLOCK       (ERROR_WPH_FIRST +  11)
+    #define ERROR_WPH_NO_MATCHING_ROOT_DIR          (ERROR_WPH_FIRST +  12)
 
     /* ******************************************************************
@@ -95 +100 @@
         USHORT  usUnknown2[2];
         CHAR    szName[1];
-    } DRIV, *PDRIV;
+    } DRIVE, *PDRIVE;
 
     #pragma pack()
 
-    /*
-     *@@ WPHANDLESBUF:
-     *      structure created by wphLoadHandles.
-     *
-     *@@added V0.9.16 (2001-10-02) [umoeller]
-     */
-
-    typedef struct _WPHANDLESBUF
-    {
-        PBYTE       pbData;         // ptr to all handles (buffers from OS2SYS.INI)
-        ULONG       cbData;         // byte count of *p
-
-        USHORT      usHiwordAbstract,   // hiword for WPAbstract handles
-                    usHiwordFileSystem; // hiword for WPFileSystem handles
-
-        PNODE       NodeHashTable[65536];
-        BOOL        fNodeHashTableValid;    // TRUE after wphRebuildNodeHashTable
-
-    } HANDLESBUF, *PHANDLESBUF;
+    /* ******************************************************************
+     *
+     *   Private declarations
+     *
+     ********************************************************************/
+
+    #ifdef INCLUDE_WPHANDLE_PRIVATE
+
+        /*
+         *@@ DRIVETREENODE:
+         *
+         *@@added V0.9.16 (2001-10-19) [umoeller]
+         */
+
+        typedef struct _DRIVETREENODE
+        {
+            TREE        Tree;       // ulKey points to the DRIVE.szName
+                                    // (null terminated)
+            PDRIVE      pDriv;      // actual DRIVE node
+
+            TREE        *ChildrenTree;  // NODETREENODE's, if any
+            LONG        cChildren;
+
+        } DRIVETREENODE, *PDRIVETREENODE;
+
+        /*
+         *@@ NODETREENODE:
+         *
+         *@@added V0.9.16 (2001-10-19) [umoeller]
+         */
+
+        typedef struct _NODETREENODE
+        {
+            TREE        Tree;       // ulKey points to the NODE.szName
+                                    // (null terminated)
+            PNODE       pNode;      // actual NODE node
+
+            TREE        *ChildrenTree;  // NODETREENODE's, if any
+            LONG        cChildren;
+
+        } NODETREENODE, *PNODETREENODE;
+
+        /*
+         *@@ WPHANDLESBUF:
+         *      structure created by wphLoadHandles.
+         *
+         *      The composed BLOCKs in the handles buffer make up a tree of
+         *      DRIVE and NODE structures (see wphandle.h). Each NODE stands
+         *      for either a directory or a file. (We don't care about the
+         *      DRIVE structures because the root directory gets a NODE also.)
+         *      Each NODE contains the non-qualified file name, an fshandle,
+         *      and the fshandle of its parent NODE.
+         *
+         *@@added V0.9.16 (2001-10-02) [umoeller]
+         */
+
+        typedef struct _WPHANDLESBUF
+        {
+            PBYTE       pbData;         // ptr to all handles (buffers from OS2SYS.INI)
+            ULONG       cbData;         // byte count of *p
+
+            USHORT      usHiwordAbstract,   // hiword for WPAbstract handles
+                        usHiwordFileSystem; // hiword for WPFileSystem handles
+
+            BOOL        fCacheValid;            // TRUE after wphRebuildNodeHashTable()
+            PNODETREENODE NodeHashTable[65536]; // hash table with all nodes sorted by handle;
+                                                // if item is NULL, no handle is assigned
+            TREE        *DrivesTree;          // DRIVETREENODE structs really
+            LONG        cDrives;
+
+            LINKLIST    llDuplicateHandles;     // linked list of NODETREENODE's that
+                                                // have an fshandle that was already
+                                                // occupied (i.e. same fshandle for two
+                                                // NODEs)
+            LINKLIST    llDuplicateShortNames;
+
+        } HANDLESBUF, *PHANDLESBUF;
+
+    #endif
 
     /* ******************************************************************
@@ -124 +189 @@
      *
      ********************************************************************/
+
+    typedef unsigned long HHANDLES;
 
     APIRET wphQueryActiveHandles(HINI hiniSystem,
@@ -132 +199 @@
                                       PUSHORT pusHiwordFileSystem);
 
-    APIRET wphRebuildNodeHashTable(PHANDLESBUF pHandlesBuf);
+    APIRET wphRebuildNodeHashTable(HHANDLES hHandles);
 
     APIRET wphLoadHandles(HINI hiniUser,
                           HINI hiniSystem,
                           const char *pcszActiveHandles,
-                          PHANDLESBUF *ppHandlesBuf);
-
-    APIRET wphFreeHandles(PHANDLESBUF *ppHandlesBuf);
+                          HHANDLES *phHandles);
+
+    APIRET wphFreeHandles(HHANDLES *phHandles);
 
     APIRET wphQueryHandleFromPath(HINI hiniUser,
@@ -146 +213 @@
                                   HOBJECT *phobj);
 
-    APIRET wphComposePath(PHANDLESBUF pHandlesBuf,
+    APIRET wphComposePath(HHANDLES hHandles,
                           USHORT usHandle,
                           PSZ pszFilename,