Changeset 68654 in vbox for trunk/src/VBox/Additions/WINNT/Mouse

Timestamp:

Sep 5, 2017 5:22:12 PM (7 years ago)

Author:

vboxsync

Message:

VBoxGuestR0Lib: Function prefix and DECL macro cleanups.

Location:

trunk/src/VBox/Additions/WINNT/Mouse

Files:

• NT4/VBoxPS2NT.cpp (modified) (4 diffs)
• NT5/VBoxMFInternal.cpp (modified) (11 diffs)

trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.cpp

@@ -1465 +1465 @@
                     if (pReq)
                     {
-                        int rc = VbglGRPerform (&pReq->header);
+                        int rc = VbglR0GRPerform (&pReq->header);
                         if (RT_SUCCESS(rc))
                         {
@@ -1507 +1507 @@
                 if (pReq)
                 {
-                    int rc = VbglGRPerform(&pReq->header);
+                    int rc = VbglR0GRPerform(&pReq->header);
                     if (RT_SUCCESS(rc))
                     {
@@ -2142 +2142 @@
         VMMDevReqMouseStatus *pReq = NULL;
 
-        rcVBox = VbglGRAlloc((VMMDevRequestHeader**)&pReq, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
+        rcVBox = VbglR0GRAlloc((VMMDevRequestHeader**)&pReq, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
         if (RT_SUCCESS(rcVBox))
         {
@@ -2149 +2149 @@
             pReq->pointerXPos = 0;
             pReq->pointerYPos = 0;
-            rcVBox = VbglGRPerform(&pReq->header);
+            rcVBox = VbglR0GRPerform(&pReq->header);
             if (RT_FAILURE(rcVBox))
                 Log(("VBoxMouseNT::DriverEntry: ERROR communicating new mouse capabilities to VMMDev. rc = %Rrc\n", rcVBox));

trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.cpp

@@ -111 +111 @@
     if (g_ctx.fIsNewProtEnabled)
         return true;
-    int rc = VbglSetMouseNotifyCallback(vboxNewProtMouseEventCb, NULL);
+    int rc = VbglR0SetMouseNotifyCallback(vboxNewProtMouseEventCb, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -118 +118 @@
         return true;
     }
-    WARN(("VbglSetMouseNotifyCallback failed: %Rrc", rc));
+    WARN(("VbglR0SetMouseNotifyCallback failed: %Rrc", rc));
     return false;
 }
@@ -133 +133 @@
     {
         g_ctx.fIsNewProtEnabled = false;
-        int rc = VbglSetMouseNotifyCallback(NULL, NULL);
+        int rc = VbglR0SetMouseNotifyCallback(NULL, NULL);
         if (RT_FAILURE(rc))
-            WARN(("VbglSetMouseNotifyCallback failed: %Rrc", rc));
+            WARN(("VbglR0SetMouseNotifyCallback failed: %Rrc", rc));
     }
 }
@@ -202 +202 @@
     if (pDevExt->pSCReq)
     {
-        int rc = VbglGRPerform(&pDevExt->pSCReq->header);
+        int rc = VbglR0GRPerform(&pDevExt->pSCReq->header);
         if (RT_SUCCESS(rc))
         {
@@ -225 +225 @@
         else
         {
-            WARN(("VbglGRPerform failed with rc=%Rrc", rc));
+            WARN(("VbglR0GRPerform failed with rc=%Rrc", rc));
         }
     }
@@ -380 +380 @@
         {
             VMMDevReqMouseStatus *req = NULL;
-            int rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
+            int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
             if (RT_SUCCESS(rc))
             {
@@ -390 +390 @@
                 req->pointerYPos = 0;
 
-                rc = VbglGRPerform(&req->header);
+                rc = VbglR0GRPerform(&req->header);
                 if (RT_SUCCESS(rc))
                     InterlockedExchange(&g_ctx.fHostInformed, TRUE);
                 else
-                    WARN(("VbglGRPerform failed with rc=%Rrc", rc));
-
-                VbglGRFree(&req->header);
+                    WARN(("VbglR0GRPerform failed with rc=%Rrc", rc));
+
+                VbglR0GRFree(&req->header);
             }
             else
-                WARN(("VbglGRAlloc failed with rc=%Rrc", rc));
+                WARN(("VbglR0GRAlloc failed with rc=%Rrc", rc));
         }
 
@@ -406 +406 @@
         {
             VMMDevReqMouseStatus *req = NULL;
-            int rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_GetMouseStatus);
+            int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_GetMouseStatus);
             if (RT_SUCCESS(rc))
                 InterlockedExchangePointer((PVOID volatile *)&pDevExt->pSCReq, req);
             else
             {
-                WARN(("VbglGRAlloc for service callback failed with rc=%Rrc", rc));
+                WARN(("VbglR0GRAlloc for service callback failed with rc=%Rrc", rc));
             }
         }
@@ -430 +430 @@
     {
         VMMDevReqMouseStatus *req = NULL;
-        int rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
+        int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
         if (RT_SUCCESS(rc))
         {
@@ -437 +437 @@
             req->pointerYPos = 0;
 
-            rc = VbglGRPerform(&req->header);
+            rc = VbglR0GRPerform(&req->header);
             if (RT_FAILURE(rc))
-                WARN(("VbglGRPerform failed with rc=%Rrc", rc));
-
-            VbglGRFree(&req->header);
+                WARN(("VbglR0GRPerform failed with rc=%Rrc", rc));
+
+            VbglR0GRFree(&req->header);
         }
         else
-            WARN(("VbglGRAlloc failed with rc=%Rrc", rc));
+            WARN(("VbglR0GRAlloc failed with rc=%Rrc", rc));
 
         InterlockedExchange(&g_ctx.fHostInformed, FALSE);
@@ -464 +464 @@
     KeReleaseSpinLock(&g_ctx.SyncLock, Irql);
     if (pSCReq)
-        VbglGRFree(&pSCReq->header);
+        VbglR0GRFree(&pSCReq->header);
 
     /*