system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 10:44:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

wbemprox: Use nameless unions/structs.

Browse source
This commit is contained in:
Alexandre Julliard 2023-07-17 11:34:13 +02:00
parent 57bfaa7514
commit 8a2dca2563
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dlls/wbemprox/builtin.c
View file

@ -17,8 +17,6 @@
*/ */
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <stdarg.h> #include <stdarg.h>
#include <intrin.h> #include <intrin.h>
@ -1578,7 +1576,7 @@ static UINT get_logical_processor_count( UINT *num_physical, UINT *num_packages
if (entry->Relationship == RelationProcessorCore) if (entry->Relationship == RelationProcessorCore)
{ {
core_relation_count++; core_relation_count++;
if (entry->u.Processor.Flags & LTP_PC_SMT) smt_enabled = TRUE; if (entry->Processor.Flags & LTP_PC_SMT) smt_enabled = TRUE;
} }
else if (entry->Relationship == RelationProcessorPackage) else if (entry->Relationship == RelationProcessorPackage)
{ {
@ -1634,7 +1632,7 @@ static const WCHAR *get_systemtype(void)
{ {
SYSTEM_INFO info; SYSTEM_INFO info;
GetNativeSystemInfo( &info ); GetNativeSystemInfo( &info );
if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"x64 based PC"; if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"x64 based PC";
return L"x86 based PC"; return L"x86 based PC";
} }
@ -2878,14 +2876,14 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e
if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue;
rec = (struct record_networkadapter *)(table->data + offset); rec = (struct record_networkadapter *)(table->data + offset);
swprintf( device_id, ARRAY_SIZE( device_id ), L"%u", aa->u.s.IfIndex ); swprintf( device_id, ARRAY_SIZE( device_id ), L"%u", aa->IfIndex );
rec->adaptertype = get_adaptertype( aa->IfType, &adaptertypeid, &physical ); rec->adaptertype = get_adaptertype( aa->IfType, &adaptertypeid, &physical );
rec->adaptertypeid = adaptertypeid; rec->adaptertypeid = adaptertypeid;
rec->description = wcsdup( aa->Description ); rec->description = wcsdup( aa->Description );
rec->device_id = wcsdup( device_id ); rec->device_id = wcsdup( device_id );
rec->guid = get_networkadapter_guid( &aa->Luid ); rec->guid = get_networkadapter_guid( &aa->Luid );
rec->index = aa->u.s.IfIndex; rec->index = aa->IfIndex;
rec->interface_index = aa->u.s.IfIndex; rec->interface_index = aa->IfIndex;
rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength );
rec->manufacturer = L"The Wine Project"; rec->manufacturer = L"The Wine Project";
rec->name = wcsdup( aa->FriendlyName ); rec->name = wcsdup( aa->FriendlyName );
@ -3115,7 +3113,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st
rec->dnsdomain = L""; rec->dnsdomain = L"";
rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress );
rec->dnsserversearchorder = get_dnsserversearchorder( aa->FirstDnsServerAddress ); rec->dnsserversearchorder = get_dnsserversearchorder( aa->FirstDnsServerAddress );
rec->index = aa->u.s.IfIndex; rec->index = aa->IfIndex;
rec->ipaddress = get_ipaddress( aa->FirstUnicastAddress ); rec->ipaddress = get_ipaddress( aa->FirstUnicastAddress );
rec->ipconnectionmetric = 20; rec->ipconnectionmetric = 20;
rec->ipenabled = -1; rec->ipenabled = -1;
@ -3243,7 +3241,7 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co
swprintf( id, ARRAY_SIZE( id ), L"Printer%u", i ); swprintf( id, ARRAY_SIZE( id ), L"Printer%u", i );
rec->device_id = wcsdup( id ); rec->device_id = wcsdup( id );
rec->drivername = wcsdup( info[i].pDriverName ); rec->drivername = wcsdup( info[i].pDriverName );
rec->horizontalresolution = info[i].pDevMode->u1.s1.dmPrintQuality; rec->horizontalresolution = info[i].pDevMode->dmPrintQuality;
rec->local = -1; rec->local = -1;
rec->location = wcsdup( info[i].pLocation ); rec->location = wcsdup( info[i].pLocation );
rec->name = wcsdup( info[i].pPrinterName ); rec->name = wcsdup( info[i].pPrinterName );
@ -3371,7 +3369,7 @@ static const WCHAR *get_osarchitecture(void)
{ {
SYSTEM_INFO info; SYSTEM_INFO info;
GetNativeSystemInfo( &info ); GetNativeSystemInfo( &info );
if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"64-bit"; if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"64-bit";
return L"32-bit"; return L"32-bit";
} }
static void get_processor_caption( WCHAR *caption, UINT len ) static void get_processor_caption( WCHAR *caption, UINT len )