Changeset 45076 in vbox

Timestamp:

Mar 18, 2013 8:07:37 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84358

Message:

GuestCtrl: *_NOTFIY_* -> *_NOTIFY_*.

Location:

trunk

Files:

• include/VBox/HostServices/GuestControlSvc.h (modified) (6 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (6 diffs)
• src/VBox/Main/src-client/GuestCtrlPrivate.cpp (modified) (7 diffs)

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -899 +899 @@
  */
 
-typedef struct CALLBACKPAYLOAD_FILE_NOTFIY_OPEN
+typedef struct CALLBACKPAYLOAD_FILE_NOTIFY_OPEN
 {
     /** IPRT result of overall operation. */
@@ -905 +905 @@
     /** File handle on successful opening. */
     uint32_t uHandle;
-} CALLBACKPAYLOAD_FILE_NOTFIY_OPEN, *PCALLBACKPAYLOAD_FILE_NOTFIY_OPEN;
-
-typedef struct CALLBACKPAYLOAD_FILE_NOTFIY_CLOSE
+} CALLBACKPAYLOAD_FILE_NOTIFY_OPEN, *PCALLBACKPAYLOAD_FILE_NOTIFY_OPEN;
+
+typedef struct CALLBACKPAYLOAD_FILE_NOTIFY_CLOSE
 {
     /** IPRT result of overall operation. */
     int32_t rc;
-} CALLBACKPAYLOAD_FILE_NOTFIY_CLOSE, *PCALLBACKPAYLOAD_FILE_NOTFIY_CLOSE;
-
-typedef struct CALLBACKPAYLOAD_FILE_NOTFIY_READ
+} CALLBACKPAYLOAD_FILE_NOTIFY_CLOSE, *PCALLBACKPAYLOAD_FILE_NOTIFY_CLOSE;
+
+typedef struct CALLBACKPAYLOAD_FILE_NOTIFY_READ
 {
     /** IPRT result of overall operation. */
@@ -921 +921 @@
     /** Actual data read (if any). */
     void *pvData;
-} CALLBACKPAYLOAD_FILE_NOTFIY_READ, *PCALLBACKPAYLOAD_FILE_NOTFIY_READ;
-
-typedef struct CALLBACKPAYLOAD_FILE_NOTFIY_WRITE
+} CALLBACKPAYLOAD_FILE_NOTIFY_READ, *PCALLBACKPAYLOAD_FILE_NOTIFY_READ;
+
+typedef struct CALLBACKPAYLOAD_FILE_NOTIFY_WRITE
 {
     /** IPRT result of overall operation. */
@@ -929 +929 @@
     /** How much data (in bytes) have been successfully written. */
     uint32_t cbWritten;
-} CALLBACKPAYLOAD_FILE_NOTFIY_WRITE, *PCALLBACKPAYLOAD_FILE_NOTFIY_WRITE;
+} CALLBACKPAYLOAD_FILE_NOTIFY_WRITE, *PCALLBACKPAYLOAD_FILE_NOTIFY_WRITE;
 
 typedef struct CALLBACKPAYLOAD_FILE_NOTFIY_SEEK
@@ -937 +937 @@
     /** New file offset after successful seek. */
     uint64_t uOffActual;
-} CALLBACKPAYLOAD_FILE_NOTFIY_SEEK, *PCALLBACKPAYLOAD_FILE_NOTFIY_SEEK;
+} CALLBACKPAYLOAD_FILE_NOTFIY_SEEK, *PCALLBACKPAYLOAD_FILE_NOTIFY_SEEK;
 
 typedef struct CALLBACKPAYLOAD_FILE_NOTFIY_TELL
@@ -945 +945 @@
     /** Current file offset after successful tell. */
     uint64_t uOffActual;
-} CALLBACKPAYLOAD_FILE_NOTFIY_TELL, *PCALLBACKPAYLOAD_FILE_NOTFIY_TELL;
+} CALLBACKPAYLOAD_FILE_NOTFIY_TELL, *PCALLBACKPAYLOAD_FILE_NOTIFY_TELL;
 
 } /* namespace guestControl */

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -208 +208 @@
 
         /* Report back in any case. */
-        CALLBACKPAYLOAD_FILE_NOTFIY_OPEN cplOpen = { rc, uHandle };
+        CALLBACKPAYLOAD_FILE_NOTIFY_OPEN cplOpen = { rc, uHandle };
         int rc2 = VbglR3GuestCtrlFileNotify(pHostCtx->uClientID, pHostCtx->uContextID,
                                             GUEST_FILE_NOTIFYTYPE_OPEN, &cplOpen, sizeof(cplOpen));
@@ -242 +242 @@
 
         /* Report back in any case. */
-        CALLBACKPAYLOAD_FILE_NOTFIY_CLOSE cplClose = { rc };
+        CALLBACKPAYLOAD_FILE_NOTIFY_CLOSE cplClose = { rc };
         int rc2 = VbglR3GuestCtrlFileNotify(pHostCtx->uClientID, pHostCtx->uContextID,
                                             GUEST_FILE_NOTIFYTYPE_CLOSE, &cplClose, sizeof(cplClose));
@@ -292 +292 @@
 
         /* Report back in any case. */
-        CALLBACKPAYLOAD_FILE_NOTFIY_READ cplRead = { rc, (uint32_t)cbRead, pvDataRead };
+        CALLBACKPAYLOAD_FILE_NOTIFY_READ cplRead = { rc, (uint32_t)cbRead, pvDataRead };
         int rc2 = VbglR3GuestCtrlFileNotify(pHostCtx->uClientID, pHostCtx->uContextID,
                                             GUEST_FILE_NOTIFYTYPE_READ, &cplRead, sizeof(cplRead));
@@ -347 +347 @@
 
         /* Report back in any case. */
-        CALLBACKPAYLOAD_FILE_NOTFIY_READ cplRead = { rc, (uint32_t)cbRead, pvDataRead };
+        CALLBACKPAYLOAD_FILE_NOTIFY_READ cplRead = { rc, (uint32_t)cbRead, pvDataRead };
         int rc2 = VbglR3GuestCtrlFileNotify(pHostCtx->uClientID, pHostCtx->uContextID,
                                             GUEST_FILE_NOTIFYTYPE_READ, &cplRead, sizeof(cplRead));
@@ -390 +390 @@
 
         /* Report back in any case. */
-        CALLBACKPAYLOAD_FILE_NOTFIY_WRITE cplWrite = { rc, (uint32_t)cbWritten };
+        CALLBACKPAYLOAD_FILE_NOTIFY_WRITE cplWrite = { rc, (uint32_t)cbWritten };
         int rc2 = VbglR3GuestCtrlFileNotify(pHostCtx->uClientID, pHostCtx->uContextID,
                                             GUEST_FILE_NOTIFYTYPE_WRITE, &cplWrite, sizeof(cplWrite));
@@ -430 +430 @@
 
         /* Report back in any case. */
-        CALLBACKPAYLOAD_FILE_NOTFIY_WRITE cplWrite = { rc, (uint32_t)cbWritten };
+        CALLBACKPAYLOAD_FILE_NOTIFY_WRITE cplWrite = { rc, (uint32_t)cbWritten };
         int rc2 = VbglR3GuestCtrlFileNotify(pHostCtx->uClientID, pHostCtx->uContextID,
                                             GUEST_FILE_NOTIFYTYPE_WRITE, &cplWrite, sizeof(cplWrite));

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -222 +222 @@
         case CALLBACKTYPE_FILE_READ:
         {
-            PCALLBACKPAYLOAD_FILE_NOTFIY_READ pThis = (PCALLBACKPAYLOAD_FILE_NOTFIY_READ)pvData;
+            PCALLBACKPAYLOAD_FILE_NOTIFY_READ pThis = (PCALLBACKPAYLOAD_FILE_NOTIFY_READ)pvData;
             AssertPtr(pThis);
             if (pThis->pvData)
@@ -314 +314 @@
         case CALLBACKTYPE_FILE_OPEN:
         {
-            PCALLBACKPAYLOAD_FILE_NOTFIY_OPEN pThis = (PCALLBACKPAYLOAD_FILE_NOTFIY_OPEN)pvData;
-            PCALLBACKPAYLOAD_FILE_NOTFIY_OPEN pCB   = (PCALLBACKPAYLOAD_FILE_NOTFIY_OPEN)pvCallback;
-            Assert(cbCallback == sizeof(CALLBACKPAYLOAD_FILE_NOTFIY_OPEN));
+            PCALLBACKPAYLOAD_FILE_NOTIFY_OPEN pThis = (PCALLBACKPAYLOAD_FILE_NOTIFY_OPEN)pvData;
+            PCALLBACKPAYLOAD_FILE_NOTIFY_OPEN pCB   = (PCALLBACKPAYLOAD_FILE_NOTIFY_OPEN)pvCallback;
+            Assert(cbCallback == sizeof(CALLBACKPAYLOAD_FILE_NOTIFY_OPEN));
 
             pThis->rc = pCB->rc;
@@ -325 +325 @@
         case CALLBACKTYPE_FILE_CLOSE:
         {
-            PCALLBACKPAYLOAD_FILE_NOTFIY_CLOSE pThis = (PCALLBACKPAYLOAD_FILE_NOTFIY_CLOSE)pvData;
-            PCALLBACKPAYLOAD_FILE_NOTFIY_CLOSE pCB   = (PCALLBACKPAYLOAD_FILE_NOTFIY_CLOSE)pvCallback;
-            Assert(cbCallback == sizeof(CALLBACKPAYLOAD_FILE_NOTFIY_CLOSE));
+            PCALLBACKPAYLOAD_FILE_NOTIFY_CLOSE pThis = (PCALLBACKPAYLOAD_FILE_NOTIFY_CLOSE)pvData;
+            PCALLBACKPAYLOAD_FILE_NOTIFY_CLOSE pCB   = (PCALLBACKPAYLOAD_FILE_NOTIFY_CLOSE)pvCallback;
+            Assert(cbCallback == sizeof(CALLBACKPAYLOAD_FILE_NOTIFY_CLOSE));
 
             pThis->rc = pCB->rc;
@@ -335 +335 @@
         case CALLBACKTYPE_FILE_READ:
         {
-            PCALLBACKPAYLOAD_FILE_NOTFIY_READ pThis = (PCALLBACKPAYLOAD_FILE_NOTFIY_READ)pvData;
-            PCALLBACKPAYLOAD_FILE_NOTFIY_READ pCB   = (PCALLBACKPAYLOAD_FILE_NOTFIY_READ)pvCallback;
-            Assert(cbCallback == sizeof(CALLBACKPAYLOAD_FILE_NOTFIY_READ));
+            PCALLBACKPAYLOAD_FILE_NOTIFY_READ pThis = (PCALLBACKPAYLOAD_FILE_NOTIFY_READ)pvData;
+            PCALLBACKPAYLOAD_FILE_NOTIFY_READ pCB   = (PCALLBACKPAYLOAD_FILE_NOTIFY_READ)pvCallback;
+            Assert(cbCallback == sizeof(CALLBACKPAYLOAD_FILE_NOTIFY_READ));
 
             pThis->rc = pCB->rc;
@@ -352 +352 @@
         case CALLBACKTYPE_FILE_WRITE:
         {
-            PCALLBACKPAYLOAD_FILE_NOTFIY_WRITE pThis = (PCALLBACKPAYLOAD_FILE_NOTFIY_WRITE)pvData;
-            PCALLBACKPAYLOAD_FILE_NOTFIY_WRITE pCB   = (PCALLBACKPAYLOAD_FILE_NOTFIY_WRITE)pvCallback;
-            Assert(cbCallback == sizeof(CALLBACKPAYLOAD_FILE_NOTFIY_WRITE));
+            PCALLBACKPAYLOAD_FILE_NOTIFY_WRITE pThis = (PCALLBACKPAYLOAD_FILE_NOTIFY_WRITE)pvData;
+            PCALLBACKPAYLOAD_FILE_NOTIFY_WRITE pCB   = (PCALLBACKPAYLOAD_FILE_NOTIFY_WRITE)pvCallback;
+            Assert(cbCallback == sizeof(CALLBACKPAYLOAD_FILE_NOTIFY_WRITE));
 
             pThis->rc = pCB->rc;
@@ -363 +363 @@
         case CALLBACKTYPE_FILE_SEEK:
         {
-            PCALLBACKPAYLOAD_FILE_NOTFIY_SEEK pThis = (PCALLBACKPAYLOAD_FILE_NOTFIY_SEEK)pvData;
-            PCALLBACKPAYLOAD_FILE_NOTFIY_SEEK pCB   = (PCALLBACKPAYLOAD_FILE_NOTFIY_SEEK)pvCallback;
+            PCALLBACKPAYLOAD_FILE_NOTIFY_SEEK pThis = (PCALLBACKPAYLOAD_FILE_NOTIFY_SEEK)pvData;
+            PCALLBACKPAYLOAD_FILE_NOTIFY_SEEK pCB   = (PCALLBACKPAYLOAD_FILE_NOTIFY_SEEK)pvCallback;
             Assert(cbCallback == sizeof(CALLBACKPAYLOAD_FILE_NOTFIY_SEEK));
 
@@ -374 +374 @@
         case CALLBACKTYPE_FILE_TELL:
         {
-            PCALLBACKPAYLOAD_FILE_NOTFIY_TELL pThis = (PCALLBACKPAYLOAD_FILE_NOTFIY_TELL)pvData;
-            PCALLBACKPAYLOAD_FILE_NOTFIY_TELL pCB   = (PCALLBACKPAYLOAD_FILE_NOTFIY_TELL)pvCallback;
+            PCALLBACKPAYLOAD_FILE_NOTIFY_TELL pThis = (PCALLBACKPAYLOAD_FILE_NOTIFY_TELL)pvData;
+            PCALLBACKPAYLOAD_FILE_NOTIFY_TELL pCB   = (PCALLBACKPAYLOAD_FILE_NOTIFY_TELL)pvCallback;
             Assert(cbCallback == sizeof(CALLBACKPAYLOAD_FILE_NOTFIY_TELL));