wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

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_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.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.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_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_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: Override variant conversion for Win32_VideoController.AdapterRAM.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 33c440fb227d8429d9ef3a9606ccc7b216d65d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c440fb227d8429d9ef3a960… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:02:02 2013 +0200 wbemprox: Override variant conversion for Win32_VideoController.AdapterRAM. --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b9bdacc..35c18e3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -403,7 +403,7 @@ static const struct column col_stdregprov[] = }; static const struct column col_videocontroller[] = { - { prop_adapterramW, CIM_UINT32 }, + { prop_adapterramW, CIM_UINT32, VT_I4 }, { prop_currentbitsperpixelW, CIM_UINT32 }, { prop_currenthorizontalresW, CIM_UINT32 }, { prop_currentverticalresW, CIM_UINT32 },

1 0

Hans Leidekker : wbemprox: Always use resize_table to allocate memory for table data.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: c9fe6139b5c9a98eb7686bef1ad5e416f3486df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fe6139b5c9a98eb7686bef1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:01:33 2013 +0200 wbemprox: Always use resize_table to allocate memory for table data. --- dlls/wbemprox/builtin.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8878ddc..b9bdacc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -846,7 +846,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co enum fill_status status = FILL_STATUS_UNFILTERED; UINT row = 0; - if (!(table->data = heap_alloc( sizeof(*rec) ))) return FILL_STATUS_FAILED; + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_computersystem *)table->data; rec->description = compsys_descriptionW; @@ -1499,7 +1499,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e return FILL_STATUS_FAILED; } for (aa = buffer; aa; aa = aa->Next) count++; - if (!(table->data = heap_alloc( sizeof(*rec) * count ))) + if (!resize_table( table, count, sizeof(*rec) )) { heap_free( buffer ); return FILL_STATUS_FAILED; @@ -1664,7 +1664,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * UINT i, offset = 0, maxclockspeed, num_logical_processors, count = get_processor_count(); enum fill_status status = FILL_STATUS_UNFILTERED; - if (!(table->data = heap_alloc( sizeof(*rec) * count ))) return FILL_STATUS_FAILED; + if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; get_processor_id( processor_id ); get_processor_manufacturer( manufacturer ); @@ -1740,7 +1740,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) enum fill_status status = FILL_STATUS_UNFILTERED; UINT row = 0; - if (!(table->data = heap_alloc( sizeof(*rec) ))) return FILL_STATUS_FAILED; + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_operatingsystem *)table->data; rec->caption = os_captionW; @@ -1956,7 +1956,8 @@ static enum fill_status fill_videocontroller( struct table *table, const struct enum fill_status status = FILL_STATUS_UNFILTERED; UINT row = 0; - if (!(table->data = heap_alloc( sizeof(*rec) ))) return FILL_STATUS_FAILED; + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + memset (&desc, 0, sizeof(desc)); hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); if (FAILED(hr)) goto done;

1 0

Henri Verbeet : wined3d: Handle pre-transformed vertices in the GLSL vertex pipe.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: ffc9f535eb7817ea4cd0d0657471e61a9813debd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc9f535eb7817ea4cd0d0657… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 09:07:12 2013 +0200 wined3d: Handle pre-transformed vertices in the GLSL vertex pipe. This also avoids a fallback to drawStridedSlow(). --- dlls/wined3d/buffer.c | 11 ++++++----- dlls/wined3d/device.c | 7 ++----- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/glsl_shader.c | 20 +++++++++++++++----- dlls/wined3d/state.c | 1 + dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 5 ++++- 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index adfae98..586b16c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -266,7 +266,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, } static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - UINT attrib_idx, const BOOL check_d3dcolor, const BOOL is_ffp_position, const BOOL is_ffp_color, + UINT attrib_idx, const BOOL check_d3dcolor, const BOOL check_position, const BOOL is_ffp_color, DWORD *stride_this_run) { const struct wined3d_stream_info_element *attrib = &si->elements[attrib_idx]; @@ -288,7 +288,7 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win if (!is_ffp_color) FIXME("Test for non-color fixed function WINED3DFMT_B8G8R8A8_UNORM format\n"); } - else if (is_ffp_position && si->position_transformed) + else if (check_position && si->position_transformed) { if (format != WINED3DFMT_R32G32B32A32_FLOAT) { @@ -309,12 +309,13 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win static BOOL buffer_find_decl(struct wined3d_buffer *This) { struct wined3d_device *device = This->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_adapter *adapter = device->adapter; const struct wined3d_stream_info *si = &device->stream_info; const struct wined3d_state *state = &device->stateBlock->state; + BOOL support_d3dcolor = adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA]; + BOOL support_xyzrhw = adapter->d3d_info.xyzrhw; UINT stride_this_run = 0; BOOL ret = FALSE; - BOOL support_d3dcolor = gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; /* In d3d7 the vertex buffer declaration NEVER changes because it is stored in the d3d7 vertex buffer. * Once we have our declaration there is no need to look it up again. Index buffers also never need @@ -386,7 +387,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) */ ret = buffer_check_attribute(This, si, WINED3D_FFP_POSITION, - TRUE, TRUE, FALSE, &stride_this_run) || ret; + TRUE, !support_xyzrhw, FALSE, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_NORMAL, TRUE, FALSE, FALSE, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_DIFFUSE, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42456b0..464181f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -332,14 +332,11 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] & ((1 << WINED3D_FFP_DIFFUSE) | (1 << WINED3D_FFP_SPECULAR)); - if ((stream_info->position_transformed || (stream_info->use_map & slow_mask)) && !stream_info->all_vbo) - { + if (((stream_info->position_transformed && !device->adapter->d3d_info.xyzrhw) + || (stream_info->use_map & slow_mask)) && !stream_info->all_vbo) device->useDrawStridedSlow = TRUE; - } else - { device->useDrawStridedSlow = FALSE; - } } if (prev_all_vbo != stream_info->all_vbo) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 91e5d1f..067c60b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2635,6 +2635,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; struct wined3d_gl_info *gl_info = &adapter->gl_info; + struct wined3d_vertex_caps vertex_caps; enum wined3d_pci_vendor card_vendor; struct fragment_caps fragment_caps; struct shader_caps shader_caps; @@ -2865,6 +2866,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) adapter->d3d_info.limits.vs_uniform_count = shader_caps.vs_uniform_count; adapter->d3d_info.limits.ps_uniform_count = shader_caps.ps_uniform_count; + adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); + adapter->d3d_info.xyzrhw = vertex_caps.xyzrhw; + adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); adapter->d3d_info.limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; adapter->d3d_info.limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 412c601..e14d7ab 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5011,11 +5011,20 @@ static GLhandleARB shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_ shader_addline(buffer, "float m;\n"); shader_addline(buffer, "vec3 r;\n"); - shader_addline(buffer, "vec4 ec_pos = gl_ModelViewMatrix * gl_Vertex;\n"); - shader_addline(buffer, "gl_Position = gl_ProjectionMatrix * ec_pos;\n"); - if (settings->clipping) - shader_addline(buffer, "gl_ClipVertex = ec_pos;\n"); - shader_addline(buffer, "ec_pos /= ec_pos.w;\n"); + if (settings->transformed) + { + shader_addline(buffer, "vec4 ec_pos = vec4(gl_Vertex.xyz, 1.0);\n"); + shader_addline(buffer, "gl_Position = gl_ProjectionMatrix * ec_pos;\n"); + shader_addline(buffer, "if (gl_Vertex.w != 0.0) gl_Position /= gl_Vertex.w;\n"); + } + else + { + shader_addline(buffer, "vec4 ec_pos = gl_ModelViewMatrix * gl_Vertex;\n"); + shader_addline(buffer, "gl_Position = gl_ProjectionMatrix * ec_pos;\n"); + if (settings->clipping) + shader_addline(buffer, "gl_ClipVertex = ec_pos;\n"); + shader_addline(buffer, "ec_pos /= ec_pos.w;\n"); + } if (!settings->normal) shader_addline(buffer, "vec3 normal = vec3(0.0);\n"); @@ -6737,6 +6746,7 @@ static void glsl_vertex_pipe_vp_enable(const struct wined3d_gl_info *gl_info, BO static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3d_vertex_caps *caps) { + caps->xyzrhw = TRUE; caps->max_active_lights = gl_info->limits.lights; caps->max_vertex_blend_matrices = 0; caps->max_vertex_blend_matrix_index = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 74261ec..ffce803 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5641,6 +5641,7 @@ static void ffp_free(struct wined3d_device *device) {} static void vp_ffp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3d_vertex_caps *caps) { + caps->xyzrhw = FALSE; caps->max_active_lights = gl_info->limits.lights; caps->max_vertex_blend_matrices = gl_info->limits.blends; caps->max_vertex_blend_matrix_index = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b83a05a..5b7fb3c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3552,8 +3552,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct { memset(settings, 0, sizeof(*settings)); - settings->clipping = state->render_states[WINED3D_RS_CLIPPING] - && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; + settings->transformed = 1; settings->point_size = state->gl_primitive_type == GL_POINTS; if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; @@ -3573,6 +3572,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct return; } + settings->transformed = 0; settings->clipping = state->render_states[WINED3D_RS_CLIPPING] && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; settings->normal = !!(si->use_map & (1 << WINED3D_FFP_NORMAL)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82a4584..1fbe081 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1193,6 +1193,7 @@ struct fragment_pipeline struct wined3d_vertex_caps { + BOOL xyzrhw; DWORD max_active_lights; DWORD max_vertex_blend_matrices; DWORD max_vertex_blend_matrix_index; @@ -1606,6 +1607,7 @@ struct wined3d_d3d_limits struct wined3d_d3d_info { struct wined3d_d3d_limits limits; + BOOL xyzrhw; BOOL vs_clipping; DWORD valid_rt_mask; }; @@ -1723,6 +1725,7 @@ struct wined3d_ffp_vs_settings DWORD ambient_source : 2; DWORD specular_source : 2; + DWORD transformed : 1; DWORD clipping : 1; DWORD normal : 1; DWORD normalize : 1; @@ -1731,7 +1734,7 @@ struct wined3d_ffp_vs_settings DWORD point_size : 1; DWORD fog_mode : 2; DWORD texcoords : 8; /* MAX_TEXTURES */ - DWORD padding : 16; + DWORD padding : 15; BYTE texgen[MAX_TEXTURES]; };

1 0

Henri Verbeet : wined3d: Don't use state_colormat() with the GLSL vertex pipe.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 8a7ddfbb53c2234907ac21ea89fd4f69b3cb8a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7ddfbb53c2234907ac21ea8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 09:07:11 2013 +0200 wined3d: Don't use state_colormat() with the GLSL vertex pipe. None of the code in there should be needed for the GLSL vertex pipe, and the "untracked materials" counter in particular will trigger an unnecessary fallback to drawStridedSlow(). --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ffe4d25..412c601 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6895,7 +6895,7 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = {STATE_RENDER(WINED3D_RS_CLIPPLANEENABLE), {STATE_RENDER(WINED3D_RS_CLIPPING), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_LIGHTING), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_AMBIENT), {STATE_RENDER(WINED3D_RS_AMBIENT), state_ambient }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_COLORVERTEX), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_COLORVERTEX), {STATE_RENDER(WINED3D_RS_COLORVERTEX), glsl_vertex_pipe_shader}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_LOCALVIEWER), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_NORMALIZENORMALS), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_DIFFUSEMATERIALSOURCE), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 491ee91..74261ec 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4574,7 +4574,7 @@ void vertexdeclaration(struct wined3d_context *context, const struct wined3d_sta && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_VIEW))) transform_world(context, state, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_COLORVERTEX))) - state_colormat(context, state, STATE_RENDER(WINED3D_RS_COLORVERTEX)); + context_apply_state(context, state, STATE_RENDER(WINED3D_RS_COLORVERTEX)); if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_LIGHTING))) state_lighting(context, state, STATE_RENDER(WINED3D_RS_LIGHTING));

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2013