Author: rharabien Date: Mon Mar 19 15:08:06 2012 New Revision: 56188
URL: http://svn.reactos.org/svn/reactos?rev=56188&view=rev Log: [INETMIB1] - Sync to Wine 1.3.37
Modified: trunk/reactos/dll/win32/inetmib1/main.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/inetmib1/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/main.c?r... ============================================================================== --- trunk/reactos/dll/win32/inetmib1/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetmib1/main.c [iso-8859-1] Mon Mar 19 15:08:06 2012 @@ -21,6 +21,9 @@ #include <stdarg.h> #include <stdlib.h> #include <limits.h> + +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "snmp.h" @@ -59,7 +62,7 @@ };
static AsnInteger32 mapStructEntryToValue(struct structToAsnValue *map, - UINT mapLen, void *record, UINT id, BYTE bPduType, SnmpVarBind *pVarBind) + UINT mapLen, void *record, UINT id, SnmpVarBind *pVarBind) { /* OIDs are 1-based */ if (!id) @@ -640,7 +643,7 @@ { *pErrorStatus = mapStructEntryToValue(mib2IfEntryMap, DEFINE_SIZEOF(mib2IfEntryMap), - &ifTable->table[tableIndex - 1], item, bPduType, + &ifTable->table[tableIndex - 1], item, pVarBind); if (bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndInteger(&pVarBind->name, @@ -713,7 +716,7 @@ if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2IpMap, - DEFINE_SIZEOF(mib2IpMap), &ipStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2IpMap), &ipStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -798,7 +801,7 @@ assert(item); *pErrorStatus = mapStructEntryToValue(mib2IpAddrMap, DEFINE_SIZEOF(mib2IpAddrMap), - &ipAddrTable->table[tableIndex - 1], item, bPduType, pVarBind); + &ipAddrTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ipAddrTable->table[tableIndex - 1].dwAddr); @@ -891,7 +894,7 @@ assert(item); *pErrorStatus = mapStructEntryToValue(mib2IpRouteMap, DEFINE_SIZEOF(mib2IpRouteMap), - &ipRouteTable->table[tableIndex - 1], item, bPduType, pVarBind); + &ipRouteTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ipRouteTable->table[tableIndex - 1].dwForwardDest); @@ -978,7 +981,7 @@ { *pErrorStatus = mapStructEntryToValue(mib2IpNetMap, DEFINE_SIZEOF(mib2IpNetMap), - &ipNetTable[tableIndex - 1], item, bPduType, pVarBind); + &ipNetTable[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndInteger(&pVarBind->name, &myOid, item, tableIndex); @@ -1053,7 +1056,7 @@ if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2IcmpMap, - DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, bPduType, + DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); @@ -1115,7 +1118,7 @@ if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2TcpMap, - DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -1165,7 +1168,7 @@ if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2UdpMap, - DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -1258,7 +1261,7 @@ assert(item); *pErrorStatus = mapStructEntryToValue(mib2UdpEntryMap, DEFINE_SIZEOF(mib2UdpEntryMap), - &udpTable->table[tableIndex - 1], item, bPduType, pVarBind); + &udpTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) { AsnObjectIdentifier oid; @@ -1342,29 +1345,26 @@ static struct mibImplementation *findSupportedQuery(UINT *ids, UINT idLength, UINT *matchingIndex) { - int indexHigh = DEFINE_SIZEOF(supportedIDs) - 1, indexLow = 0, i; - struct mibImplementation *impl = NULL; + int indexHigh = DEFINE_SIZEOF(supportedIDs) - 1, indexLow = 0; AsnObjectIdentifier oid1 = { idLength, ids};
if (!idLength) return NULL; - for (i = (indexLow + indexHigh) / 2; !impl && indexLow <= indexHigh; - i = (indexLow + indexHigh) / 2) - { - INT cmp; - - cmp = SnmpUtilOidNCmp(&oid1, &supportedIDs[i].name, idLength); - if (!cmp) - { - impl = &supportedIDs[i]; + + while (indexLow <= indexHigh) + { + INT cmp, i = (indexLow + indexHigh) / 2; + if (!(cmp = SnmpUtilOidNCmp(&oid1, &supportedIDs[i].name, idLength))) + { *matchingIndex = i; - } - else if (cmp > 0) + return &supportedIDs[i]; + } + if (cmp > 0) indexLow = i + 1; else indexHigh = i - 1; } - return impl; + return NULL; }
/*****************************************************************************
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=5... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Mar 19 15:08:06 2012 @@ -72,7 +72,7 @@ reactos/dll/win32/imagehlp # Synced to Wine-1.3.37 reactos/dll/win32/imm32 # Synced to Wine-1.3.37 reactos/dll/win32/inetcomm # Synced to Wine-1.3.37 -reactos/dll/win32/inetmib1 # Autosync +reactos/dll/win32/inetmib1 # Synced to Wine-1.3.37 reactos/dll/win32/initpki # Synced to Wine-1.3.37 reactos/dll/win32/inseng # Synced to Wine-1.3.37 reactos/dll/win32/iphlpapi # Out of sync