Changeset 78326 in vbox for trunk/src/VBox/Additions/WINNT/SharedFolders/driver/file.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/file.cpp (modified) (10 diffs)

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

@@ -302 +302 @@
     ByteCount = ctx.cbData;
 
-    Status = VBoxErrorToNTStatus(vrc);
+    Status = vbsfNtVBoxStatusToNt(vrc);
 
     if (Status != STATUS_SUCCESS)
@@ -418 +418 @@
     ByteCount = ctx.cbData;
 
-    Status = VBoxErrorToNTStatus(vrc);
+    Status = vbsfNtVBoxStatusToNt(vrc);
 
     if (Status != STATUS_SUCCESS)
@@ -516 +516 @@
                        LowIoContext->ParamsFor.Locks.ByteOffset, LowIoContext->ParamsFor.Locks.Length, fu32Lock);
 
-    Status = VBoxErrorToNTStatus(vrc);
+    Status = vbsfNtVBoxStatusToNt(vrc);
 
     Log(("VBOXSF: MRxLocks: Returned 0x%08X\n", Status));
@@ -547 +547 @@
     vrc = VbglR0SfFlush(&g_SfClient, &pNetRootExtension->map, pVBoxFobx->hFile);
 
-    Status = VBoxErrorToNTStatus(vrc);
+    Status = vbsfNtVBoxStatusToNt(vrc);
 
     Log(("VBOXSF: MRxFlush: Returned 0x%08X\n", Status));
@@ -553 +553 @@
 }
 
-NTSTATUS vbsfSetEndOfFile(IN OUT struct _RX_CONTEXT * RxContext,
+NTSTATUS vbsfNtSetEndOfFile(IN OUT struct _RX_CONTEXT * RxContext,
                           IN OUT PLARGE_INTEGER pNewFileSize,
                           OUT PLARGE_INTEGER pNewAllocationSize)
@@ -569 +569 @@
     int vrc;
 
-    Log(("VBOXSF: vbsfSetEndOfFile: New size = %RX64 (%p), pNewAllocationSize = %p\n",
+    Log(("VBOXSF: vbsfNtSetEndOfFile: New size = %RX64 (%p), pNewAllocationSize = %p\n",
          pNewFileSize->QuadPart, pNewFileSize, pNewAllocationSize));
 
@@ -575 +575 @@
 
     cbBuffer = sizeof(SHFLFSOBJINFO);
-    pObjInfo = (SHFLFSOBJINFO *)vbsfAllocNonPagedMem(cbBuffer);
+    pObjInfo = (SHFLFSOBJINFO *)vbsfNtAllocNonPagedMem(cbBuffer);
     if (!pObjInfo)
     {
@@ -588 +588 @@
                          SHFL_INFO_SET | SHFL_INFO_SIZE, &cbBuffer, (PSHFLDIRINFO)pObjInfo);
 
-    Log(("VBOXSF: vbsfSetEndOfFile: VbglR0SfFsInfo returned %Rrc\n", vrc));
-
-    Status = VBoxErrorToNTStatus(vrc);
+    Log(("VBOXSF: vbsfNtSetEndOfFile: VbglR0SfFsInfo returned %Rrc\n", vrc));
+
+    Status = vbsfNtVBoxStatusToNt(vrc);
     if (Status == STATUS_SUCCESS)
     {
-        Log(("VBOXSF: vbsfSetEndOfFile: VbglR0SfFsInfo new allocation size = %RX64\n",
+        Log(("VBOXSF: vbsfNtSetEndOfFile: VbglR0SfFsInfo new allocation size = %RX64\n",
              pObjInfo->cbAllocated));
 
@@ -601 +601 @@
 
     if (pObjInfo)
-        vbsfFreeNonPagedMem(pObjInfo);
-
-    Log(("VBOXSF: vbsfSetEndOfFile: Returned 0x%08X\n", Status));
+        vbsfNtFreeNonPagedMem(pObjInfo);
+
+    Log(("VBOXSF: vbsfNtSetEndOfFile: Returned 0x%08X\n", Status));
     return Status;
 }
@@ -618 +618 @@
     RT_NOREF(RxContext);
 
-    /* Note: On Windows hosts vbsfSetEndOfFile returns ACCESS_DENIED if the file has been
+    /* Note: On Windows hosts vbsfNtSetEndOfFile returns ACCESS_DENIED if the file has been
      *       opened in APPEND mode. Writes to a file will extend it anyway, therefore it is
      *       better to not call the host at all and tell the caller that the file was extended.