Juan Lang : inetmib1: Return errors from SnmpExtensionQuery.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 782efb5702daf4cd5891f5a1811d7aa0aa97f115
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=782efb5702daf4cd5891f5a181...

Author: Juan Lang 
Date:   Thu May  7 09:29:11 2009 -0700

inetmib1: Return errors from SnmpExtensionQuery.

---

dlls/inetmib1/main.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c
index 3269b07..1093117 100644
--- a/dlls/inetmib1/main.c
+++ b/dlls/inetmib1/main.c
@@ -1279,6 +1279,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList,
     AsnObjectIdentifier mib2oid = DEFINE_OID(mib2);
     AsnInteger32 error = SNMP_ERRORSTATUS_NOERROR, errorIndex = 0;
     UINT i;
+    BOOL ret = TRUE;

TRACE("(0x%02x, %p, %p, %p)\n", bPduType, pVarBindList,
         pErrorStatus, pErrorIndex);
@@ -1300,7 +1301,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList,
                 impl = findSupportedQuery(pVarBindList->list[i].name.ids, len,
                     &matchingIndex);
             if (impl && impl->query)
-                impl->query(bPduType, &pVarBindList->list[i], &error);
+                ret = impl->query(bPduType, &pVarBindList->list[i], &error);
             else
                 error = SNMP_ERRORSTATUS_NOSUCHNAME;
             if (error == SNMP_ERRORSTATUS_NOSUCHNAME &&
@@ -1317,7 +1318,8 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList,
                     error = SNMP_ERRORSTATUS_NOERROR;
                     impl = &supportedIDs[matchingIndex];
                     if (impl->query)
-                        impl->query(bPduType, &pVarBindList->list[i], &error);
+                        ret = impl->query(bPduType, &pVarBindList->list[i],
+                            &error);
                     else
                         error = SNMP_ERRORSTATUS_NOSUCHNAME;
                 }
@@ -1327,7 +1329,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList,
                 if (error == SNMP_ERRORSTATUS_NOSUCHNAME)
                 {
                     SnmpUtilOidFree(&pVarBindList->list[i].name);
-                    SnmpUtilOidCpy(&pVarBindList->list[i].name,
+                    ret = SnmpUtilOidCpy(&pVarBindList->list[i].name,
                         &supportedIDs[matchingIndex - 1].name);
                     pVarBindList->list[i].name.ids[
                         pVarBindList->list[i].name.idLength - 1] += 1;
@@ -1339,7 +1341,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList,
     }
     *pErrorStatus = error;
     *pErrorIndex = errorIndex;
-    return TRUE;
+    return ret;
 }

/*****************************************************************************