June 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 1.6-rc2
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: website Branch: master Commit: 9d91314ff73f7b56f5ab719fda963ba1b62cc500 URL: http://source.winehq.org/git/website.git/?a=commit;h=9d91314ff73f7b56f5ab71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 20:24:40 2013 +0200 Wine release 1.6-rc2 --- news/en/2013061401.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/en/2013061401.xml b/news/en/2013061401.xml new file mode 100644 index 0000000..dbc59de --- /dev/null +++ b/news/en/2013061401.xml @@ -0,0 +1,12 @@ +<news> +<date>June 14, 2013</date> +<title>Wine 1.6-rc2 Released</title> +<body> + The Wine development release 1.6-rc2 is now available. + <a href="{$root}/announce/1.6-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.6-rc2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.6-rc2.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: f56a36e18e8ad1e3dd9c3a5a81e52f87fb9b76fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56a36e18e8ad1e3dd9c3a5a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 20:15:43 2013 +0200 Release 1.6-rc2. --- ANNOUNCE | 546 +++++++++++++++++-------------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 164 insertions(+), 402 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f56a36e18e8ad1e3dd9c3…

1 0

Tag wine-1.6-rc2 : Alexandre Julliard : Release 1.6-rc2
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: refs/tags/wine-1.6-rc2 Tag: 96529f2d945c73f4ef43692bfb6fa5594b4e5718 URL: http://source.winehq.org/git/wine.git/?a=tag;h=96529f2d945c73f4ef43692bfb6f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 20:15:43 2013 +0200 Release 1.6-rc2

1 0

Hans Leidekker : wbemprox: Implement Win32_Processor.AddressWidth.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 38e976acdd0ae9fdfdd08497e3b076c5adfbc75e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e976acdd0ae9fdfdd08497e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:02:29 2013 +0200 wbemprox: Implement Win32_Processor.AddressWidth. --- dlls/wbemprox/builtin.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 35c18e3..1e9c297 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -92,6 +92,8 @@ static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_adaptertypeW[] = {'A','d','a','p','t','e','r','T','y','p','e',0}; +static const WCHAR prop_addresswidthW[] = + {'A','d','d','r','e','s','s','W','i','d','t','h',0}; static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; static const WCHAR prop_bootpartitionW[] = @@ -354,6 +356,7 @@ static const struct column col_process[] = }; static const struct column col_processor[] = { + { prop_addresswidthW, CIM_UINT16, VT_I4 }, { prop_cpustatusW, CIM_UINT16 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_familyW, CIM_UINT16, VT_I4 }, @@ -595,6 +598,7 @@ struct record_process }; struct record_processor { + UINT16 addresswidth; UINT16 cpu_status; const WCHAR *device_id; UINT16 family; @@ -1655,6 +1659,13 @@ static UINT get_processor_maxclockspeed( void ) } return ret; } +static const WCHAR *get_osarchitecture(void) +{ + SYSTEM_INFO info; + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; + return os_32bitW; +} static enum fill_status fill_processor( struct table *table, const struct expr *cond ) { @@ -1676,6 +1687,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * for (i = 0; i < count; i++) { rec = (struct record_processor *)(table->data + offset); + rec->addresswidth = get_osarchitecture() == os_32bitW ? 32 : 64; rec->cpu_status = 1; /* CPU Enabled */ sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); @@ -1715,13 +1727,6 @@ static WCHAR *get_lastbootuptime(void) sprintfW( ret, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); return ret; } -static const WCHAR *get_osarchitecture(void) -{ - SYSTEM_INFO info; - GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; - return os_32bitW; -} static WCHAR *get_systemdirectory(void) { void *redir;

1 0

Hans Leidekker : wbemprox: Implement Win32_Processor.NumberOfCores.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 772236fe8550cd0081c96b95889cd1472657524e URL: http://source.winehq.org/git/wine.git/?a=commit;h=772236fe8550cd0081c96b958… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:03:25 2013 +0200 wbemprox: Implement Win32_Processor.NumberOfCores. --- dlls/wbemprox/builtin.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1e9c297..3504602 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -168,6 +168,8 @@ static const WCHAR prop_modelW[] = {'M','o','d','e','l',0}; static const WCHAR prop_netconnectionstatusW[] = {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; +static const WCHAR prop_numcoresW[] = + {'N','u','m','b','e','r','O','f','C','o','r','e','s',0}; static const WCHAR prop_numlogicalprocessorsW[] = {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; static const WCHAR prop_numprocessorsW[] = @@ -363,6 +365,7 @@ static const struct column col_processor[] = { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_maxclockspeedW, CIM_UINT32, VT_I4 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_numcoresW, CIM_UINT32, VT_I4 }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_uniqueidW, CIM_STRING } @@ -605,6 +608,7 @@ struct record_processor const WCHAR *manufacturer; UINT32 maxclockspeed; const WCHAR *name; + UINT32 num_cores; UINT32 num_logical_processors; const WCHAR *processor_id; const WCHAR *unique_id; @@ -799,13 +803,14 @@ static UINT get_processor_count(void) return info.NumberOfProcessors; } -static UINT get_logical_processor_count(void) +static UINT get_logical_processor_count( UINT *num_cores ) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION *info; UINT i, j, count = 0; NTSTATUS status; ULONG len; + if (num_cores) *num_cores = get_processor_count(); status = NtQuerySystemInformation( SystemLogicalProcessorInformation, NULL, 0, &len ); if (status != STATUS_INFO_LENGTH_MISMATCH) return get_processor_count(); @@ -816,10 +821,17 @@ static UINT get_logical_processor_count(void) heap_free( info ); return get_processor_count(); } + if (num_cores) *num_cores = 0; for (i = 0; i < len / sizeof(*info); i++) { - if (info[i].Relationship != RelationProcessorCore) continue; - for (j = 0; j < sizeof(ULONG_PTR); j++) if (info[i].ProcessorMask & (1 << j)) count++; + if (info[i].Relationship == RelationProcessorCore) + { + for (j = 0; j < sizeof(ULONG_PTR); j++) if (info[i].ProcessorMask & (1 << j)) count++; + } + else if (info[i].Relationship == RelationProcessorPackage && num_cores) + { + for (j = 0; j < sizeof(ULONG_PTR); j++) if (info[i].ProcessorMask & (1 << j)) (*num_cores)++; + } } heap_free( info ); return count; @@ -859,7 +871,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co rec->manufacturer = compsys_manufacturerW; rec->model = compsys_modelW; rec->name = get_computername(); - rec->num_logical_processors = get_logical_processor_count(); + rec->num_logical_processors = get_logical_processor_count( NULL ); rec->num_processors = get_processor_count(); rec->total_physical_memory = get_total_physical_memory(); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); @@ -1672,7 +1684,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; struct record_processor *rec; - UINT i, offset = 0, maxclockspeed, num_logical_processors, count = get_processor_count(); + UINT i, offset = 0, maxclockspeed, num_cores, num_logical_processors, count = get_processor_count(); enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; @@ -1682,7 +1694,8 @@ static enum fill_status fill_processor( struct table *table, const struct expr * get_processor_name( name ); maxclockspeed = get_processor_maxclockspeed(); - num_logical_processors = get_logical_processor_count() / count; + num_logical_processors = get_logical_processor_count( &num_cores ) / count; + num_cores /= count; for (i = 0; i < count; i++) { @@ -1695,6 +1708,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->manufacturer = heap_strdupW( manufacturer ); rec->maxclockspeed = maxclockspeed; rec->name = heap_strdupW( name ); + rec->num_cores = num_cores; rec->num_logical_processors = num_logical_processors; rec->processor_id = heap_strdupW( processor_id ); rec->unique_id = NULL;

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.CodeSet.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: ba3fe55cd4ee88db33d9cff519a98f51a2ad7124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3fe55cd4ee88db33d9cff51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:04:11 2013 +0200 wbemprox: Implement Win32_OperatingSystem.CodeSet. --- dlls/wbemprox/builtin.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3504602..5ac7630 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -102,6 +102,8 @@ static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_classW[] = {'C','l','a','s','s',0}; +static const WCHAR prop_codesetW[] = + {'C','o','d','e','S','e','t',0}; static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; static const WCHAR prop_cpustatusW[] = @@ -322,6 +324,7 @@ static const struct column col_networkadapter[] = static const struct column col_os[] = { { prop_captionW, CIM_STRING }, + { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_osarchitectureW, CIM_STRING }, @@ -565,6 +568,7 @@ struct record_networkadapter struct record_operatingsystem { const WCHAR *caption; + const WCHAR *codeset; const WCHAR *csdversion; const WCHAR *lastbootuptime; const WCHAR *osarchitecture; @@ -1752,6 +1756,13 @@ static WCHAR *get_systemdirectory(void) Wow64RevertWow64FsRedirection( redir ); return ret; } +static WCHAR *get_codeset(void) +{ + static const WCHAR fmtW[] = {'%','u',0}; + WCHAR *ret = heap_alloc( 11 * sizeof(WCHAR) ); + if (ret) sprintfW( ret, fmtW, GetACP() ); + return ret; +} static enum fill_status fill_os( struct table *table, const struct expr *cond ) { @@ -1763,6 +1774,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec = (struct record_operatingsystem *)table->data; rec->caption = os_captionW; + rec->codeset = get_codeset(); rec->csdversion = os_csdversionW; rec->lastbootuptime = get_lastbootuptime(); rec->osarchitecture = get_osarchitecture();

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.CountryCode.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: f560bb480161d7a2543a75da3645eef269ebd5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f560bb480161d7a2543a75da3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:04:43 2013 +0200 wbemprox: Implement Win32_OperatingSystem.CountryCode. --- dlls/wbemprox/builtin.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5ac7630..67779dc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -106,6 +106,8 @@ static const WCHAR prop_codesetW[] = {'C','o','d','e','S','e','t',0}; static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; +static const WCHAR prop_countrycodeW[] = + {'C','o','u','n','t','r','y','C','o','d','e',0}; static const WCHAR prop_cpustatusW[] = {'C','p','u','S','t','a','t','u','s',0}; static const WCHAR prop_csdversionW[] = @@ -325,6 +327,7 @@ static const struct column col_os[] = { { prop_captionW, CIM_STRING }, { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_osarchitectureW, CIM_STRING }, @@ -569,6 +572,7 @@ struct record_operatingsystem { const WCHAR *caption; const WCHAR *codeset; + const WCHAR *countrycode; const WCHAR *csdversion; const WCHAR *lastbootuptime; const WCHAR *osarchitecture; @@ -1763,6 +1767,12 @@ static WCHAR *get_codeset(void) if (ret) sprintfW( ret, fmtW, GetACP() ); return ret; } +static WCHAR *get_countrycode(void) +{ + WCHAR *ret = heap_alloc( 6 * sizeof(WCHAR) ); + if (ret) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_ICOUNTRY, ret, 6 ); + return ret; +} static enum fill_status fill_os( struct table *table, const struct expr *cond ) { @@ -1775,6 +1785,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec = (struct record_operatingsystem *)table->data; rec->caption = os_captionW; rec->codeset = get_codeset(); + rec->countrycode = get_countrycode(); rec->csdversion = os_csdversionW; rec->lastbootuptime = get_lastbootuptime(); rec->osarchitecture = get_osarchitecture();

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.Locale.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 3c623ef38ceb24f2733a769f5b434bb4667acaa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c623ef38ceb24f2733a769f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:05:26 2013 +0200 wbemprox: Implement Win32_OperatingSystem.Locale. --- dlls/wbemprox/builtin.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 67779dc..ec039dc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -158,6 +158,8 @@ static const WCHAR prop_intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; static const WCHAR prop_lastbootuptimeW[] = {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; +static const WCHAR prop_localeW[] = + {'L','o','c','a','l','e',0}; static const WCHAR prop_macaddressW[] = {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = @@ -330,6 +332,7 @@ static const struct column col_os[] = { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, + { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, @@ -575,6 +578,7 @@ struct record_operatingsystem const WCHAR *countrycode; const WCHAR *csdversion; const WCHAR *lastbootuptime; + const WCHAR *locale; const WCHAR *osarchitecture; UINT32 oslanguage; UINT32 osproductsuite; @@ -1773,6 +1777,12 @@ static WCHAR *get_countrycode(void) if (ret) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_ICOUNTRY, ret, 6 ); return ret; } +static WCHAR *get_locale(void) +{ + WCHAR *ret = heap_alloc( 5 * sizeof(WCHAR) ); + if (ret) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, ret, 5 ); + return ret; +} static enum fill_status fill_os( struct table *table, const struct expr *cond ) { @@ -1788,8 +1798,9 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->countrycode = get_countrycode(); rec->csdversion = os_csdversionW; rec->lastbootuptime = get_lastbootuptime(); + rec->locale = get_locale(); rec->osarchitecture = get_osarchitecture(); - rec->oslanguage = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); + rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->servicepackmajor = 3;

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem. ServicePackMinorVersion.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: ad60f235d25adb5592c661899b8e508fa79b9e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad60f235d25adb5592c661899… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:06:01 2013 +0200 wbemprox: Implement Win32_OperatingSystem.ServicePackMinorVersion. --- dlls/wbemprox/builtin.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ec039dc..53d3b6f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -206,6 +206,8 @@ static const WCHAR prop_serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; static const WCHAR prop_servicepackmajorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; +static const WCHAR prop_servicepackminorW[] = + {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; static const WCHAR prop_startmodeW[] = @@ -338,6 +340,7 @@ static const struct column col_os[] = { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, { prop_ostypeW, CIM_UINT16, VT_I4 }, { prop_servicepackmajorW, CIM_UINT16, VT_I4 }, + { prop_servicepackminorW, CIM_UINT16, VT_I4 }, { prop_suitemaskW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_versionW, CIM_STRING } @@ -584,6 +587,7 @@ struct record_operatingsystem UINT32 osproductsuite; UINT16 ostype; UINT16 servicepackmajor; + UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; const WCHAR *version; @@ -1804,6 +1808,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->servicepackmajor = 3; + rec->servicepackminor = 0; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); rec->version = os_versionW;

1 0

Hans Leidekker : wbemprox: Implement Win32_VideoController.AdapterDACType.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 861f7450333083d1d3dd110052ff91d8cf7f1e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=861f7450333083d1d3dd11005… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:06:46 2013 +0200 wbemprox: Implement Win32_VideoController.AdapterDACType. --- dlls/wbemprox/builtin.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 53d3b6f..d9755ea 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -88,6 +88,8 @@ static const WCHAR prop_acceptstopW[] = {'A','c','c','e','p','t','S','t','o','p',0}; static const WCHAR prop_accessmaskW[] = {'A','c','c','e','s','s','M','a','s','k',0}; +static const WCHAR prop_adapterdactypeW[] = + {'A','d','a','p','t','e','r','D','A','C','T','y','p','e',0}; static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_adaptertypeW[] = @@ -421,6 +423,7 @@ static const struct column col_stdregprov[] = }; static const struct column col_videocontroller[] = { + { prop_adapterdactypeW, CIM_STRING }, { prop_adapterramW, CIM_UINT32, VT_I4 }, { prop_currentbitsperpixelW, CIM_UINT32 }, { prop_currenthorizontalresW, CIM_UINT32 }, @@ -487,6 +490,8 @@ static const WCHAR os_versionW[] = {'5','.','1','.','2','6','0','0',0}; static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; +static const WCHAR videocontroller_dactypeW[] = + {'I','n','t','e','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; @@ -668,6 +673,7 @@ struct record_stdregprov }; struct record_videocontroller { + const WCHAR *adapter_dactype; UINT32 adapter_ram; UINT32 current_bitsperpixel; UINT32 current_horizontalres; @@ -2032,6 +2038,7 @@ static enum fill_status fill_videocontroller( struct table *table, const struct done: rec = (struct record_videocontroller *)table->data; + rec->adapter_dactype = videocontroller_dactypeW; rec->adapter_ram = vidmem; rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); rec->current_horizontalres = hres;

1 0