Changeset 84347 in vbox for trunk/src/VBox/Main

Timestamp:

May 18, 2020 7:02:01 PM (5 years ago)

Author:

vboxsync

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

138029

Message:

Add/WebService: VC++ 19.2 build adjustment. bugref:8489

Location:

trunk/src/VBox/Main/webservice

Files:

• vboxweb.cpp (modified) (2 diffs)
• websrv-cpp.xsl (modified) (5 diffs)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -2327 +2327 @@
 {
     RT_NOREF(resp);
-    HRESULT rc = S_OK;
+    HRESULT rc;
     WEBDEBUG(("-- entering %s\n", __FUNCTION__));
 
-    do
     {
         // findRefFromId and the delete call below require the lock
@@ -2336 +2335 @@
 
         ManagedObjectRef *pRef;
-        if ((rc = ManagedObjectRef::findRefFromId(req->_USCOREthis, &pRef, false)))
-        {
+        rc = ManagedObjectRef::findRefFromId(req->_USCOREthis, &pRef, false);
+        if (rc == S_OK)
+        {
+            WEBDEBUG(("   found reference; deleting!\n"));
+            // this removes the object from all stacks; since
+            // there's a ComPtr<> hidden inside the reference,
+            // this should also invoke Release() on the COM
+            // object
+            delete pRef;
+        }
+        else
             RaiseSoapInvalidObjectFault(soap, req->_USCOREthis);
-            break;
-        }
-
-        WEBDEBUG(("   found reference; deleting!\n"));
-        // this removes the object from all stacks; since
-        // there's a ComPtr<> hidden inside the reference,
-        // this should also invoke Release() on the COM
-        // object
-        delete pRef;
-    } while (0);
+    }
 
     WEBDEBUG(("-- leaving %s, rc: %#lx\n", __FUNCTION__, rc));

trunk/src/VBox/Main/webservice/websrv-cpp.xsl

@@ -528 +528 @@
       <xsl:text>        }&#10;</xsl:text>
       <xsl:value-of select="concat('        const WSDLT_ID &amp;idThis = ', $structprefix, $G_nameObjectRefEncoded, ';&#10;')" />
-      <xsl:value-of select="'        if ((rc = findComPtrFromId(soap, idThis, pObj, false)))&#10;'" />
+      <xsl:value-of select="'        if ((rc = findComPtrFromId(soap, idThis, pObj, false)) != S_OK)&#10;'" />
       <xsl:text>            break;&#10;</xsl:text>
     </xsl:when>
@@ -580 +580 @@
           <xsl:value-of select="'    ComPtr&lt;IUnknown&gt; tmpObject;'" />
           <xsl:call-template name="emitNewlineIndent8" />
-          <xsl:value-of select="concat('    if ((rc = findComPtrFromId(soap, ', $structprefix, $name, '[i], tmpObject, true)))')" />
+          <xsl:value-of select="concat('    if ((rc = findComPtrFromId(soap, ', $structprefix, $name, '[i], tmpObject, true)) != S_OK)')" />
           <xsl:call-template name="emitNewlineIndent8" />
           <xsl:text>        break;</xsl:text>
@@ -589 +589 @@
           <xsl:value-of select="concat('    ComPtr&lt;', $type, '&gt; tmpObject;')" />
           <xsl:call-template name="emitNewlineIndent8" />
-          <xsl:value-of select="concat('    if ((rc = findComPtrFromId(soap, ', $structprefix, $name, '[i], tmpObject, true)))')" />
+          <xsl:value-of select="concat('    if ((rc = findComPtrFromId(soap, ', $structprefix, $name, '[i], tmpObject, true)) != S_OK)')" />
           <xsl:call-template name="emitNewlineIndent8" />
           <xsl:text>        break;</xsl:text>
@@ -647 +647 @@
           <xsl:value-of select="concat(' comcall_', $name, ';')" />
           <xsl:call-template name="emitNewlineIndent8" />
-          <xsl:value-of select="concat('if ((rc = findComPtrFromId(soap, ', $structprefix, $name, ', comcall_', $name,', true)))')" />
+          <xsl:value-of select="concat('if ((rc = findComPtrFromId(soap, ', $structprefix, $name, ', comcall_', $name,', true)) != S_OK)')" />
           <xsl:call-template name="emitNewlineIndent8" />
           <xsl:text>    break</xsl:text>
@@ -665 +665 @@
               <xsl:value-of select="concat(' comcall_', $name, ';')" />
               <xsl:call-template name="emitNewlineIndent8" />
-              <xsl:value-of select="concat('if ((rc = findComPtrFromId(soap, ', $structprefix, $name, ', comcall_', $name,', true)))')" />
+              <xsl:value-of select="concat('if ((rc = findComPtrFromId(soap, ', $structprefix, $name, ', comcall_', $name,', true)) != S_OK)')" />
               <xsl:call-template name="emitNewlineIndent8" />
               <xsl:text>    break</xsl:text>