ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wbemprox: Implement Win32_NetworkAdapter.PhysicalAdapter.

Browse Source
This commit is contained in:
Hans Leidekker 2013-06-14 10:07:43 +02:00 committed by Alexandre Julliard
parent 861f745033
commit 02ba712a05
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/wbemprox/builtin.c
View File

@ -192,6 +192,8 @@ static const WCHAR prop_ostypeW[] =
{'O','S','T','y','p','e',0}; {'O','S','T','y','p','e',0};
static const WCHAR prop_parameterW[] = static const WCHAR prop_parameterW[] =
{'P','a','r','a','m','e','t','e','r',0}; {'P','a','r','a','m','e','t','e','r',0};
static const WCHAR prop_physicaladapterW[] =
{'P','h','y','s','i','c','a','l','A','d','a','p','t','e','r',0};
static const WCHAR prop_pnpdeviceidW[] = static const WCHAR prop_pnpdeviceidW[] =
{'P','N','P','D','e','v','i','c','e','I','D',0}; {'P','N','P','D','e','v','i','c','e','I','D',0};
static const WCHAR prop_pprocessidW[] = static const WCHAR prop_pprocessidW[] =
@ -326,6 +328,7 @@ static const struct column col_networkadapter[] =
{ prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_manufacturerW, CIM_STRING }, { prop_manufacturerW, CIM_STRING },
{ prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, { prop_netconnectionstatusW, CIM_UINT16, VT_I4 },
{ prop_physicaladapterW, CIM_BOOLEAN },
{ prop_pnpdeviceidW, CIM_STRING }, { prop_pnpdeviceidW, CIM_STRING },
{ prop_speedW, CIM_UINT64 } { prop_speedW, CIM_UINT64 }
}; };
@ -576,6 +579,7 @@ struct record_networkadapter
const WCHAR *mac_address; const WCHAR *mac_address;
const WCHAR *manufacturer; const WCHAR *manufacturer;
UINT16 netconnection_status; UINT16 netconnection_status;
int physicaladapter;
const WCHAR *pnpdevice_id; const WCHAR *pnpdevice_id;
UINT64 speed; UINT64 speed;
}; };
@ -1499,7 +1503,7 @@ static WCHAR *get_mac_address( const BYTE *addr, DWORD len )
sprintfW( ret, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); sprintfW( ret, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] );
return ret; return ret;
} }
static const WCHAR *get_adaptertype( DWORD type ) static const WCHAR *get_adaptertype( DWORD type, int *physical )
{ {
static const WCHAR ethernetW[] = {'E','t','h','e','r','n','e','t',' ','8','0','2','.','3',0}; static const WCHAR ethernetW[] = {'E','t','h','e','r','n','e','t',' ','8','0','2','.','3',0};
static const WCHAR wirelessW[] = {'W','i','r','e','l','e','s','s',0}; static const WCHAR wirelessW[] = {'W','i','r','e','l','e','s','s',0};
@ -1508,13 +1512,12 @@ static const WCHAR *get_adaptertype( DWORD type )
switch (type) switch (type)
{ {
case IF_TYPE_ETHERNET_CSMACD: return ethernetW; case IF_TYPE_ETHERNET_CSMACD: *physical = -1; return ethernetW;
case IF_TYPE_IEEE80211: return wirelessW; case IF_TYPE_IEEE80211: *physical = -1; return wirelessW;
case IF_TYPE_IEEE1394: return firewireW; case IF_TYPE_IEEE1394: *physical = -1; return firewireW;
case IF_TYPE_TUNNEL: return tunnelW; case IF_TYPE_TUNNEL: *physical = 0; return tunnelW;
default: break; default: *physical = 0; return NULL;
} }
return NULL;
} }
static enum fill_status fill_networkadapter( struct table *table, const struct expr *cond ) static enum fill_status fill_networkadapter( struct table *table, const struct expr *cond )
@ -1525,6 +1528,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e
IP_ADAPTER_ADDRESSES *aa, *buffer; IP_ADAPTER_ADDRESSES *aa, *buffer;
UINT row = 0, offset = 0, count = 0; UINT row = 0, offset = 0, count = 0;
DWORD size = 0, ret; DWORD size = 0, ret;
int physical;
enum fill_status status = FILL_STATUS_UNFILTERED; enum fill_status status = FILL_STATUS_UNFILTERED;
ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size );
@ -1546,12 +1550,13 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e
{ {
rec = (struct record_networkadapter *)(table->data + offset); rec = (struct record_networkadapter *)(table->data + offset);
sprintfW( device_id, fmtW, aa->u.s.IfIndex ); sprintfW( device_id, fmtW, aa->u.s.IfIndex );
rec->adaptertype = get_adaptertype( aa->IfType ); rec->adaptertype = get_adaptertype( aa->IfType, &physical );
rec->device_id = heap_strdupW( device_id ); rec->device_id = heap_strdupW( device_id );
rec->interface_index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex;
rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength );
rec->manufacturer = compsys_manufacturerW; rec->manufacturer = compsys_manufacturerW;
rec->netconnection_status = get_connection_status( aa->OperStatus ); rec->netconnection_status = get_connection_status( aa->OperStatus );
rec->physicaladapter = physical;
rec->pnpdevice_id = networkadapter_pnpdeviceidW; rec->pnpdevice_id = networkadapter_pnpdeviceidW;
rec->speed = 1000000; rec->speed = 1000000;
if (!match_row( table, row, cond, &status )) if (!match_row( table, row, cond, &status ))