Changeset 78326 in vbox for trunk/src/VBox/Additions/WINNT/SharedFolders/driver/path.cpp

Timestamp:

Apr 26, 2019 2:45:38 PM (6 years ago)

Author:

vboxsync

Message:

winnt/vboxsf: Cleaned up the vbsfhlp.cpp code, removing a few unused functions and such. bugref:9172

File:

• trunk/src/VBox/Additions/WINNT/SharedFolders/driver/path.cpp (modified) (18 diffs)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/path.cpp

@@ -141 +141 @@
 
     /* Initialize create parameters. */
-    pCreateParms = (SHFLCREATEPARMS *)vbsfAllocNonPagedMem(sizeof(SHFLCREATEPARMS));
+    pCreateParms = (SHFLCREATEPARMS *)vbsfNtAllocNonPagedMem(sizeof(SHFLCREATEPARMS));
     if (!pCreateParms)
     {
@@ -265 +265 @@
         if (!bf.SlashHack)
         {
-            Status = vbsfShflStringFromUnicodeAlloc(&ParsedPath, RemainingName->Buffer, RemainingName->Length);
+            Status = vbsfNtShflStringFromUnicodeAlloc(&ParsedPath, RemainingName->Buffer, RemainingName->Length);
             if (Status != STATUS_SUCCESS)
                 goto failure;
@@ -272 +272 @@
         {
             /* Add back the slash we had to hide from RDBSS. */
-            Status = vbsfShflStringFromUnicodeAlloc(&ParsedPath, NULL, RemainingName->Length + sizeof(RTUTF16));
+            Status = vbsfNtShflStringFromUnicodeAlloc(&ParsedPath, NULL, RemainingName->Length + sizeof(RTUTF16));
             if (Status != STATUS_SUCCESS)
                 goto failure;
@@ -288 +288 @@
         vrc = VbglR0SfCreate(&g_SfClient, &pNetRootExtension->map, ParsedPath, pCreateParms);
 
-        vbsfFreeNonPagedMem(ParsedPath);
+        vbsfNtFreeNonPagedMem(ParsedPath);
     }
 
@@ -321 +321 @@
             {
                 *pulCreateAction = FILE_DOES_NOT_EXIST;
-                Status = VBoxErrorToNTStatus(vrc);
+                Status = vbsfNtVBoxStatusToNt(vrc);
                 goto failure;
             }
@@ -436 +436 @@
     *pInfo = pCreateParms->Info;
 
-    vbsfFreeNonPagedMem(pCreateParms);
+    vbsfNtFreeNonPagedMem(pCreateParms);
 
     return Status;
@@ -452 +452 @@
 
     if (pCreateParms)
-        vbsfFreeNonPagedMem(pCreateParms);
+        vbsfNtFreeNonPagedMem(pCreateParms);
 
     return Status;
@@ -689 +689 @@
 
     cbBuffer = sizeof(SHFLFSOBJINFO);
-    pHGCMBuffer = (uint8_t *)vbsfAllocNonPagedMem(cbBuffer);
+    pHGCMBuffer = (uint8_t *)vbsfNtAllocNonPagedMem(cbBuffer);
     if (!pHGCMBuffer)
     {
@@ -714 +714 @@
 
     if (vrc != VINF_SUCCESS)
-        Status = VBoxErrorToNTStatus(vrc);
+        Status = vbsfNtVBoxStatusToNt(vrc);
 
     if (pHGCMBuffer)
-        vbsfFreeNonPagedMem(pHGCMBuffer);
+        vbsfNtFreeNonPagedMem(pHGCMBuffer);
 
     Log(("VBOXSF: vbsfSetFileInfo: Returned 0x%08X\n", Status));
@@ -761 +761 @@
 
     if (vrc != VINF_SUCCESS)
-        Status = VBoxErrorToNTStatus(vrc);
+        Status = vbsfNtVBoxStatusToNt(vrc);
 
     Log(("VBOXSF: vbsfCloseFileHandle: Returned 0x%08X\n", Status));
@@ -811 +811 @@
         /* Remove file or directory if delete action is pending. */
         if (capFcb->OpenCount == 0)
-            Status = vbsfRemove(RxContext);
+            Status = vbsfNtRemove(RxContext);
     }
 
@@ -817 +817 @@
 }
 
-NTSTATUS vbsfRemove(IN PRX_CONTEXT RxContext)
+NTSTATUS vbsfNtRemove(IN PRX_CONTEXT RxContext)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -832 +832 @@
     PSHFLSTRING ParsedPath = NULL;
 
-    Log(("VBOXSF: vbsfRemove: Delete %.*ls. open count = %d\n",
+    Log(("VBOXSF: vbsfNtRemove: Delete %.*ls. open count = %d\n",
          RemainingName->Length / sizeof(WCHAR), RemainingName->Buffer, capFcb->OpenCount));
 
@@ -839 +839 @@
         vbsfCloseFileHandle(pNetRootExtension, pVBoxFobx);
 
-    Log(("VBOXSF: vbsfRemove: RemainingName->Length %d\n", RemainingName->Length));
-    Status = vbsfShflStringFromUnicodeAlloc(&ParsedPath, RemainingName->Buffer, RemainingName->Length);
+    Log(("VBOXSF: vbsfNtRemove: RemainingName->Length %d\n", RemainingName->Length));
+    Status = vbsfNtShflStringFromUnicodeAlloc(&ParsedPath, RemainingName->Buffer, RemainingName->Length);
     if (Status != STATUS_SUCCESS)
         return Status;
@@ -850 +850 @@
 
     if (ParsedPath)
-        vbsfFreeNonPagedMem(ParsedPath);
+        vbsfNtFreeNonPagedMem(ParsedPath);
 
     if (vrc == VINF_SUCCESS)
         SetFlag(capFobx->pSrvOpen->Flags, SRVOPEN_FLAG_FILE_DELETED);
 
-    Status = VBoxErrorToNTStatus(vrc);
+    Status = vbsfNtVBoxStatusToNt(vrc);
     if (vrc != VINF_SUCCESS)
-        Log(("VBOXSF: vbsfRemove: VbglR0SfRemove failed with %Rrc\n", vrc));
-
-    Log(("VBOXSF: vbsfRemove: Returned 0x%08X\n", Status));
+        Log(("VBOXSF: vbsfNtRemove: VbglR0SfRemove failed with %Rrc\n", vrc));
+
+    Log(("VBOXSF: vbsfNtRemove: Returned 0x%08X\n", Status));
     return Status;
 }
 
-NTSTATUS vbsfRename(IN PRX_CONTEXT RxContext,
+NTSTATUS vbsfNtRename(IN PRX_CONTEXT RxContext,
                     IN FILE_INFORMATION_CLASS FileInformationClass,
                     IN PVOID pBuffer,
@@ -888 +888 @@
     Assert(FileInformationClass == FileRenameInformation);
 
-    Log(("VBOXSF: vbsfRename: FileName = %.*ls\n",
+    Log(("VBOXSF: vbsfNtRename: FileName = %.*ls\n",
          RenameInformation->FileNameLength / sizeof(WCHAR), &RenameInformation->FileName[0]));
 
@@ -898 +898 @@
     SetFlag(pSrvOpen->Flags, SRVOPEN_FLAG_FILE_RENAMED);
 
-    Log(("VBOXSF: vbsfRename: RenameInformation->FileNameLength = %d\n", RenameInformation->FileNameLength));
-    Status = vbsfShflStringFromUnicodeAlloc(&DestPath, RenameInformation->FileName, (uint16_t)RenameInformation->FileNameLength);
+    Log(("VBOXSF: vbsfNtRename: RenameInformation->FileNameLength = %d\n", RenameInformation->FileNameLength));
+    Status = vbsfNtShflStringFromUnicodeAlloc(&DestPath, RenameInformation->FileName, (uint16_t)RenameInformation->FileNameLength);
     if (Status != STATUS_SUCCESS)
         return Status;
 
-    Log(("VBOXSF: vbsfRename: Destination path = %.*ls\n",
+    Log(("VBOXSF: vbsfNtRename: Destination path = %.*ls\n",
          DestPath->u16Length / sizeof(WCHAR), &DestPath->String.ucs2[0]));
 
-    Log(("VBOXSF: vbsfRename: RemainingName->Length = %d\n", RemainingName->Length));
-    Status = vbsfShflStringFromUnicodeAlloc(&SrcPath, RemainingName->Buffer, RemainingName->Length);
+    Log(("VBOXSF: vbsfNtRename: RemainingName->Length = %d\n", RemainingName->Length));
+    Status = vbsfNtShflStringFromUnicodeAlloc(&SrcPath, RemainingName->Buffer, RemainingName->Length);
     if (Status != STATUS_SUCCESS)
     {
-        vbsfFreeNonPagedMem(DestPath);
+        vbsfNtFreeNonPagedMem(DestPath);
         return Status;
     }
 
-    Log(("VBOXSF: vbsfRename: Source path = %.*ls\n",
+    Log(("VBOXSF: vbsfNtRename: Source path = %.*ls\n",
          SrcPath->u16Length / sizeof(WCHAR), &SrcPath->String.ucs2[0]));
 
@@ -922 +922 @@
         flags |= SHFL_RENAME_REPLACE_IF_EXISTS;
 
-    Log(("VBOXSF: vbsfRename: Calling VbglR0SfRename\n"));
+    Log(("VBOXSF: vbsfNtRename: Calling VbglR0SfRename\n"));
     vrc = VbglR0SfRename(&g_SfClient, &pNetRootExtension->map, SrcPath, DestPath, flags);
 
-    vbsfFreeNonPagedMem(SrcPath);
-    vbsfFreeNonPagedMem(DestPath);
-
-    Status = VBoxErrorToNTStatus(vrc);
+    vbsfNtFreeNonPagedMem(SrcPath);
+    vbsfNtFreeNonPagedMem(DestPath);
+
+    Status = vbsfNtVBoxStatusToNt(vrc);
     if (vrc != VINF_SUCCESS)
-        Log(("VBOXSF: vbsfRename: VbglR0SfRename failed with %Rrc\n", vrc));
-
-    Log(("VBOXSF: vbsfRename: Returned 0x%08X\n", Status));
+        Log(("VBOXSF: vbsfNtRename: VbglR0SfRename failed with %Rrc\n", vrc));
+
+    Log(("VBOXSF: vbsfNtRename: Returned 0x%08X\n", Status));
     return Status;
 }