Changeset 62666 in vbox

Timestamp:

Jul 28, 2016 11:45:51 PM (8 years ago)

Author:

vboxsync

Message:

SUPDrv-win.cpp: Fixed supdrvOSMsrProberWrite to do writing instead of reading, duh. Fixed a bunch of warnings.

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (modified) (12 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -313 +313 @@
 *********************************************************************************************************************************/
 RT_C_DECLS_BEGIN
-ULONG _stdcall DriverEntry(PDRIVER_OBJECT pDrvObj, PUNICODE_STRING pRegPath);
+NTSTATUS _stdcall DriverEntry(PDRIVER_OBJECT pDrvObj, PUNICODE_STRING pRegPath);
 RT_C_DECLS_END
 
@@ -484 +484 @@
                 g_pDevObjUsr = NULL;
             }
-#endif
             IoDeleteDevice(g_pDevObjUsr);
             g_pDevObjUsr = NULL;
+#endif
         }
         IoDeleteDevice(g_pDevObjSys);
@@ -537 +537 @@
  * @param   pRegPath    Registry base path.
  */
-ULONG _stdcall DriverEntry(PDRIVER_OBJECT pDrvObj, PUNICODE_STRING pRegPath)
-{
+NTSTATUS _stdcall DriverEntry(PDRIVER_OBJECT pDrvObj, PUNICODE_STRING pRegPath)
+{
+    RT_NOREF1(pRegPath);
+
     /*
      * Sanity checks.
@@ -1013 +1015 @@
                                                      PIO_STATUS_BLOCK pIoStatus, PDEVICE_OBJECT pDevObj)
 {
+    RT_NOREF1(fWait);
+
     /*
      * Only the normal devices, not the stub or error info ones.
@@ -1097 +1101 @@
                 {
                     rcNt = GetExceptionCode();
+                    Hdr.cbIn = Hdr.cbOut = 0; /* shut up MSC */
                 }
             }
             else
+            {
+                Hdr.cbIn = Hdr.cbOut = 0; /* shut up MSC */
                 rcNt = STATUS_INVALID_PARAMETER;
+            }
             if (NT_SUCCESS(rcNt))
             {
@@ -1450 +1458 @@
 {
     Log(("VBoxDrvNtRead\n"));
+    RT_NOREF1(pDevObj);
 
     NTSTATUS rcNt;
@@ -1579 +1588 @@
  *
  * @param   pCallbackContext    User supplied parameter (pDevObj)
- * @param   pArgument1          First argument
- * @param   pArgument2          Second argument
- */
-VOID _stdcall VBoxPowerDispatchCallback(PVOID pCallbackContext, PVOID pArgument1, PVOID pArgument2)
-{
-    PDEVICE_OBJECT pDevObj = (PDEVICE_OBJECT)pCallbackContext;
-
-    Log(("VBoxPowerDispatchCallback: %x %x\n", pArgument1, pArgument2));
+ * @param   pvArgument1         First argument
+ * @param   pvArgument2         Second argument
+ */
+VOID _stdcall VBoxPowerDispatchCallback(PVOID pCallbackContext, PVOID pvArgument1, PVOID pvArgument2)
+{
+    /*PDEVICE_OBJECT pDevObj = (PDEVICE_OBJECT)pCallbackContext;*/ RT_NOREF1(pCallbackContext);
+    Log(("VBoxPowerDispatchCallback: %x %x\n", pvArgument1, pvArgument2));
 
     /* Power change imminent? */
-    if ((unsigned)pArgument1 == PO_CB_SYSTEM_STATE_LOCK)
-    {
-        if ((unsigned)pArgument2 == 0)
+    if ((uintptr_t)pvArgument1 == PO_CB_SYSTEM_STATE_LOCK)
+    {
+        if (pvArgument2 == NULL)
             Log(("VBoxPowerDispatchCallback: about to go into suspend mode!\n"));
         else
@@ -1597 +1605 @@
 
         /* Inform any clients that have registered themselves with IPRT. */
-        RTPowerSignalEvent(((unsigned)pArgument2 == 0) ? RTPOWEREVENT_SUSPEND : RTPOWEREVENT_RESUME);
+        RTPowerSignalEvent(pvArgument2 == NULL ? RTPOWEREVENT_SUSPEND : RTPOWEREVENT_RESUME);
     }
 }
@@ -1616 +1624 @@
         pSession->pNtProtect = NULL;
     }
+#else
+    RT_NOREF2(pDevExt, pSession);
 #endif
 }
@@ -1668 +1678 @@
 bool VBOXCALL  supdrvOSGetForcedAsyncTscMode(PSUPDRVDEVEXT pDevExt)
 {
+    RT_NOREF1(pDevExt);
     return false;
 }
@@ -2131 +2142 @@
 
     if (idCpu == NIL_RTCPUID)
-        supdrvNtMsProberReadOnCpu(idCpu, &Args, NULL);
+        supdrvNtMsProberWriteOnCpu(idCpu, &Args, NULL);
     else
     {
-        int rc = RTMpOnSpecific(idCpu, supdrvNtMsProberReadOnCpu, &Args, NULL);
+        int rc = RTMpOnSpecific(idCpu, supdrvNtMsProberWriteOnCpu, &Args, NULL);
         if (RT_FAILURE(rc))
             return rc;
@@ -2158 +2169 @@
     bool                fRestoreGp  = true;
     RTCCUINTREG         fOldFlags;
+    RT_NOREF2(idCpu, pvUser2);
 
     /*