Changeset 13835 in vbox for trunk/src/VBox/Main/win

Timestamp:

Nov 5, 2008 2:34:43 AM (16 years ago)

Author:

vboxsync

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

38826

Message:

s/VBOX_SUCCESS/RT_SUCCESS/g s/VBOX_FAILURE/RT_FAILURE/g - VBOX_SUCCESS and VBOX_FAILURE have *NOT* been retired (because old habbits die hard) just sligtly deprecated.

Location:

trunk/src/VBox/Main/win

Files:

• svchlp.cpp (modified) (11 diffs)
• svcmain.cpp (modified) (1 diff)

trunk/src/VBox/Main/win/svchlp.cpp

@@ -38 +38 @@
  *  FALSE... This method ensures that at least VERR_GENERAL_FAILURE is returned
  *  in cases like that. Intended to be called immediately after a failed API
- *  call. 
+ *  call.
  */
 static inline int rtErrConvertFromWin32OnFailure()
@@ -44 +44 @@
     DWORD err = GetLastError();
     return err == NO_ERROR ? VERR_GENERAL_FAILURE
-                           : RTErrConvertFromWin32 (err); 
+                           : RTErrConvertFromWin32 (err);
 }
 
@@ -97 +97 @@
 
     Bstr pipeName = Utf8StrFmt ("\\\\.\\pipe\\%s", aName);
-    
+
     HANDLE pipe = CreateFile (pipeName,
                               GENERIC_READ | GENERIC_WRITE,
@@ -114 +114 @@
     mWriteEnd = pipe;
     mName = aName;
-    
+
     return VINF_SUCCESS;
 }
@@ -148 +148 @@
         mReadEnd = NULL;
     }
-        
+
     mIsOpen = false;
     mIsServer = false;
     mName.setNull();
- 
+
     return VINF_SUCCESS;
 }
@@ -174 +174 @@
     if (!mIsOpen)
         return VERR_WRONG_ORDER;
-    
+
     /* write -1 for NULL strings */
     if (aVal.isNull())
         return write ((size_t) ~0);
-    
+
     size_t len = aVal.length();
-    
+
     /* write string length */
     int vrc = write (len);
-    if (VBOX_SUCCESS (vrc))
+    if (RT_SUCCESS (vrc))
     {
         /* write string data */
@@ -216 +216 @@
     if (!mIsOpen)
         return VERR_WRONG_ORDER;
-    
+
     size_t len = 0;
-    
+
     /* read string length */
     int vrc = read (len);
-    if (VBOX_FAILURE (vrc))
+    if (RT_FAILURE (vrc))
         return vrc;
-    
+
     /* length -1 means a NULL string */
     if (len == (size_t) ~0)
@@ -230 +230 @@
         return VINF_SUCCESS;
     }
-    
+
     aVal.alloc (len + 1);
     aVal.mutableRaw() [len] = 0;
-    
+
     /* read string data */
     vrc = read (aVal.mutableRaw(), len);
@@ -244 +244 @@
     Utf8Str guidStr;
     int vrc = read (guidStr);
-    if (VBOX_SUCCESS (vrc))
+    if (RT_SUCCESS (vrc))
         aGuid = Guid (guidStr);
     return vrc;
@@ -259 +259 @@
     int vrc = VINF_SUCCESS;
     SVCHlpMsg::Code msgCode = SVCHlpMsg::Null;
-    
+
     do
-    { 
+    {
         vrc = read (msgCode);
-        if (VBOX_FAILURE (vrc))
+        if (RT_FAILURE (vrc))
             return vrc;
-        
+
         /* terminate request received */
         if (msgCode == SVCHlpMsg::Null)
@@ -283 +283 @@
                     VERR_GENERAL_FAILURE);
         }
-        
-        if (VBOX_FAILURE (vrc))
+
+        if (RT_FAILURE (vrc))
             return vrc;
     }
     while (1);
-    
+
     /* we never get here */
     AssertFailed();

trunk/src/VBox/Main/win/svcmain.cpp

@@ -243 +243 @@
                 vrc = VERR_INVALID_PARAMETER;
 
-            if (VBOX_SUCCESS (vrc))
+            if (RT_SUCCESS (vrc))
             {
                 /* do the helper job */
                 SVCHlpServer server;
                 vrc = server.open (pipeName);
-                if (VBOX_SUCCESS (vrc))
+                if (RT_SUCCESS (vrc))
                     vrc = server.run();
             }
-            if (VBOX_FAILURE (vrc))
+            if (RT_FAILURE (vrc))
             {
                 Utf8Str err = Utf8StrFmt (