Changeset 3386

Timestamp:

Jun 25, 2020, 8:49:02 PM (5 years ago)

Author:

bird

Message:

ntunlink.c: Make birdMakeWritable work with non-NULL hRoot.

File:

• trunk/src/lib/nt/ntunlink.c (modified) (3 diffs)

trunk/src/lib/nt/ntunlink.c

@@ -39 +39 @@
 
 
-static MY_NTSTATUS birdMakeWritable(MY_UNICODE_STRING *pNtPath)
+static MY_NTSTATUS birdMakeWritable(HANDLE hRoot, MY_UNICODE_STRING *pNtPath)
 {
     MY_NTSTATUS rcNt;
     HANDLE      hFile;
 
-    rcNt = birdOpenFileUniStr(NULL /*hRoot*/,
+    rcNt = birdOpenFileUniStr(hRoot,
                               pNtPath,
                               FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES | SYNCHRONIZE,
@@ -115 +115 @@
             if (rcNt == STATUS_CANNOT_DELETE)
             {
-                birdMakeWritable(&NtPath);
+                birdMakeWritable(hRoot, &NtPath);
                 rcNt = g_pfnNtDeleteFile(&ObjAttr);
             }
@@ -153 +153 @@
 
                 fMayTryAgain = 0;
-                birdMakeWritable(&NtPath);
+                birdMakeWritable(hRoot, &NtPath);
             }
         }