Changeset 63078 in vbox

Timestamp:

Aug 5, 2016 11:10:21 PM (8 years ago)

Author:

vboxsync

Message:

GA/NT/SharedFolders: warnings

Location:

trunk/src/VBox/Additions/WINNT/SharedFolders/driver

Files:

• file.c (modified) (2 diffs)
• vbsf.c (modified) (13 diffs)
• vbsf.h (modified) (1 diff)

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

@@ -588 +588 @@
 }
 
-NTSTATUS VBoxMRxExtendStub(IN OUT struct _RX_CONTEXT * RxContext, IN OUT PLARGE_INTEGER pNewFileSize,
-                           OUT PLARGE_INTEGER pNewAllocationSize)
+/** See PMRX_EXTENDFILE_CALLDOWN in ddk/mrx.h
+ *
+ * Documentation says it returns STATUS_SUCCESS on success and an error
+ * status on failure, so the ULONG return type is probably just a typo that
+ * stuck.
+ */
+ULONG NTAPI VBoxMRxExtendStub(IN OUT struct _RX_CONTEXT * RxContext, IN OUT PLARGE_INTEGER pNewFileSize,
+                              OUT PLARGE_INTEGER pNewAllocationSize)
 {
     RT_NOREF(RxContext);
@@ -604 +610 @@
     return STATUS_SUCCESS;
 }
+

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c

@@ -408 +408 @@
     UNICODE_STRING VBoxMRxName;
     UNICODE_STRING UserModeDeviceName;
-    PMRX_VBOX_DEVICE_EXTENSION pDeviceExtension;
+    PMRX_VBOX_DEVICE_EXTENSION pDeviceExtension = NULL;
     ULONG i;
     int vboxRC;
@@ -480 +480 @@
         {
             Log(("VBOXSF: DriverEntry: RxRegisterMinirdr failed: 0x%08X\n", Status ));
-            try_return(Status);
+            try_return((void)Status);
         }
 
@@ -512 +512 @@
             Log(("VBOXSF: DriverEntry: IoCreateSymbolicLink: 0x%08X\n",
                  Status));
-            try_return(Status);
+            try_return((void)Status);
         }
         Log(("VBOXSF: DriverEntry: Symbolic link created.\n"));
@@ -536 +536 @@
     }
 
+    AssertPtr(pDeviceExtension);
     pDeviceExtension->hgcmClient = hgcmClient;
 
@@ -571 +572 @@
     NTSTATUS Status;
     MRX_VBOX_STATE CurrentState;
+    RT_NOREF(RxContext, RxDeviceObject);
 
     Log(("VBOXSF: MRxStart\n"));
@@ -597 +599 @@
 NTSTATUS VBoxMRxStop(PRX_CONTEXT RxContext, IN OUT PRDBSS_DEVICE_OBJECT RxDeviceObject)
 {
+    RT_NOREF(RxContext, RxDeviceObject);
     Log(("VBOXSF: MRxStop\n"));
     return STATUS_SUCCESS;
@@ -1462 +1465 @@
 NTSTATUS VBoxMRxSetEaInfo(IN OUT PRX_CONTEXT RxContext)
 {
+    RT_NOREF(RxContext);
     Log(("VBOXSF: MRxSetEaInfo\n"));
     return STATUS_NOT_IMPLEMENTED;
@@ -1468 +1472 @@
 NTSTATUS VBoxMRxFsCtl (IN OUT PRX_CONTEXT RxContext)
 {
+    RT_NOREF(RxContext);
     Log(("VBOXSF: MRxFsCtl\n"));
     return STATUS_INVALID_DEVICE_REQUEST;
@@ -1474 +1479 @@
 NTSTATUS VBoxMRxNotifyChangeDirectory(IN OUT PRX_CONTEXT RxContext)
 {
+    RT_NOREF(RxContext);
     Log(("VBOXSF: MRxNotifyChangeDirectory\n"));
     return STATUS_NOT_IMPLEMENTED;
@@ -1480 +1486 @@
 NTSTATUS VBoxMRxQuerySdInfo(IN OUT PRX_CONTEXT RxContext)
 {
+    RT_NOREF(RxContext);
     Log(("VBOXSF: MRxQuerySdInfo\n"));
     return STATUS_NOT_IMPLEMENTED;
@@ -1486 +1493 @@
 NTSTATUS VBoxMRxSetSdInfo(IN OUT struct _RX_CONTEXT * RxContext)
 {
+    RT_NOREF(RxContext);
     Log(("VBOXSF: MRxSetSdInfo\n"));
     return STATUS_NOT_IMPLEMENTED;
@@ -1495 +1503 @@
 NTSTATUS WmlTinySystemControl(IN OUT PVOID pWmiLibInfo, IN PVOID pDevObj, IN PVOID pIrp)
 {
+    RT_NOREF(pWmiLibInfo, pDevObj, pIrp);
     return STATUS_WMI_GUID_NOT_FOUND;
 }
@@ -1500 +1509 @@
 ULONG WmlTrace(IN ULONG ulType, IN PVOID pTraceUuid, IN ULONG64 ullLogger, ...)
 {
+    RT_NOREF(ulType, pTraceUuid, ullLogger);
     return STATUS_SUCCESS;
 }

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.h

@@ -155 +155 @@
 NTSTATUS VBoxMRxNotifyChangeDirectory(IN OUT PRX_CONTEXT RxContext);
 
-NTSTATUS VBoxMRxExtendStub(IN OUT struct _RX_CONTEXT * RxContext,
-                           IN OUT PLARGE_INTEGER pNewFileSize,
-                           OUT PLARGE_INTEGER pNewAllocationSize);
+ULONG NTAPI VBoxMRxExtendStub(IN OUT struct _RX_CONTEXT * RxContext,
+                              IN OUT PLARGE_INTEGER pNewFileSize,
+                              OUT PLARGE_INTEGER pNewAllocationSize);
 NTSTATUS VBoxMRxCompleteBufferingStateChangeRequest(IN OUT PRX_CONTEXT RxContext,
                                                     IN OUT PMRX_SRV_OPEN SrvOpen,