Changeset 154 for trunk/src/helpers/wphandle.c

Timestamp:

Apr 16, 2002, 8:27:19 AM (23 years ago)

Author:

umoeller

Message:

Misc changes.

File:

• trunk/src/helpers/wphandle.c (modified) (5 diffs)

trunk/src/helpers/wphandle.c

@@ -852 +852 @@
  *
  *@@added V0.9.16 (2001-10-02) [umoeller]
+ *@@changed V0.9.19 (2002-04-14) [umoeller]: fixed wrong error for parent handles
  */
 
@@ -857 +858 @@
                           USHORT usHandle,         // in: handle to search for
                           PXSTRING pstrFilename,   // in/out: filename
+                          ULONG ulLevel,           // in: recursion level (initially 0)
                           PNODE *ppNode)           // out: node found (ptr can be NULL)
 {
@@ -871 +873 @@
             // node has parent:
             // recurse first
-            if (arc = ComposeThis(pHandlesBuf,
-                                  pNode->usParentHandle,
-                                  pstrFilename,
-                                  ppNode))
-            {
-                if (arc == ERROR_INVALID_HANDLE)
-                    // parent handle not found:
-                    arc = ERROR_WPH_INVALID_PARENT_HANDLE;
-                // else leave the APIRET, this might be dangerous
-            }
-            else
+            if (!(arc = ComposeThis(pHandlesBuf,
+                                    pNode->usParentHandle,
+                                    pstrFilename,
+                                    ulLevel + 1,
+                                    ppNode)))
             {
                 // no error:
@@ -893 +889 @@
     }
     else
-        arc = ERROR_INVALID_HANDLE;
+        // handle not found:
+        if (ulLevel == 0)       // V0.9.19 (2002-04-14) [umoeller]
+            arc = ERROR_INVALID_HANDLE;
+        else
+            arc = ERROR_WPH_INVALID_PARENT_HANDLE;
 
     if (!arc)
@@ -953 +953 @@
                                         usHandle,
                                         &str,
+                                        0,      // initial recursion level
                                         ppNode)))
                     if (str.ulLength > cbFilename - 1)