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

Hans Leidekker : wbemprox: Implement Win32_SoundDevice.Name.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: 74cf8f53f099af6b38fa0a4a91e74e192d5a657e URL: http://source.winehq.org/git/wine.git/?a=commit;h=74cf8f53f099af6b38fa0a4a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:08:24 2013 +0200 wbemprox: Implement Win32_SoundDevice.Name. --- dlls/wbemprox/builtin.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 500e6ec..d90165f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -416,6 +416,7 @@ static const struct column col_service[] = }; static const struct column col_sounddevice[] = { + { prop_nameW, CIM_STRING }, { prop_productnameW, CIM_STRING } }; static const struct column col_stdregprov[] = @@ -667,6 +668,7 @@ struct record_service }; struct record_sounddevice { + const WCHAR *name; const WCHAR *productname; }; struct record_stdregprov @@ -736,7 +738,7 @@ static const struct record_qualifier data_qualifier[] = }; static const struct record_sounddevice data_sounddevice[] = { - { sounddevice_productnameW } + { sounddevice_productnameW, sounddevice_productnameW } }; static const struct record_stdregprov data_stdregprov[] = {

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.PhysicalAdapter.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: 02ba712a0531f97e4c3c0f1d09ee5e6232145b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ba712a0531f97e4c3c0f1d0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:07:43 2013 +0200 wbemprox: Implement Win32_NetworkAdapter.PhysicalAdapter. --- dlls/wbemprox/builtin.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d9755ea..500e6ec 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -192,6 +192,8 @@ static const WCHAR prop_ostypeW[] = {'O','S','T','y','p','e',0}; static const WCHAR prop_parameterW[] = {'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[] = {'P','N','P','D','e','v','i','c','e','I','D',0}; static const WCHAR prop_pprocessidW[] = @@ -326,6 +328,7 @@ static const struct column col_networkadapter[] = { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_manufacturerW, CIM_STRING }, { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, + { prop_physicaladapterW, CIM_BOOLEAN }, { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } }; @@ -576,6 +579,7 @@ struct record_networkadapter const WCHAR *mac_address; const WCHAR *manufacturer; UINT16 netconnection_status; + int physicaladapter; const WCHAR *pnpdevice_id; 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] ); 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 wirelessW[] = {'W','i','r','e','l','e','s','s',0}; @@ -1508,13 +1512,12 @@ static const WCHAR *get_adaptertype( DWORD type ) switch (type) { - case IF_TYPE_ETHERNET_CSMACD: return ethernetW; - case IF_TYPE_IEEE80211: return wirelessW; - case IF_TYPE_IEEE1394: return firewireW; - case IF_TYPE_TUNNEL: return tunnelW; - default: break; + case IF_TYPE_ETHERNET_CSMACD: *physical = -1; return ethernetW; + case IF_TYPE_IEEE80211: *physical = -1; return wirelessW; + case IF_TYPE_IEEE1394: *physical = -1; return firewireW; + case IF_TYPE_TUNNEL: *physical = 0; return tunnelW; + default: *physical = 0; return NULL; } - return NULL; } 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; UINT row = 0, offset = 0, count = 0; DWORD size = 0, ret; + int physical; enum fill_status status = FILL_STATUS_UNFILTERED; 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); 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->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->manufacturer = compsys_manufacturerW; rec->netconnection_status = get_connection_status( aa->OperStatus ); + rec->physicaladapter = physical; rec->pnpdevice_id = networkadapter_pnpdeviceidW; rec->speed = 1000000; if (!match_row( table, row, cond, &status ))

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.Locale.
by Alexandre Julliard June 14, 2013

June 14, 2013

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 June 14, 2013

June 14, 2013

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_Processor.NumberOfCores.
by Alexandre Julliard June 14, 2013

June 14, 2013

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_VideoController.AdapterDACType.
by Alexandre Julliard June 14, 2013

June 14, 2013

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

Henri Verbeet : wined3d: Handle pre-transformed vertices in the GLSL vertex pipe.
by Alexandre Julliard June 14, 2013

June 14, 2013

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

Hans Leidekker : wbemprox: Always use resize_table to allocate memory for table data.
by Alexandre Julliard June 14, 2013

June 14, 2013

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

Hans Leidekker : wbemprox: Override variant conversion for Win32_VideoController.AdapterRAM.
by Alexandre Julliard June 14, 2013

June 14, 2013

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

Dmitry Timoshkov : oleaut32: Do not rely on vtable placement in the implementation structure.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: 08bade6880e3818a990d05b25ba0ccc266755bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=08bade6880e3818a990d05b25… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 14 10:03:56 2013 +0900 oleaut32: Do not rely on vtable placement in the implementation structure. --- dlls/oleaut32/typelib.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9502b3c..bc7ee56 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4628,7 +4628,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfo( if(index >= This->TypeInfoCount) return TYPE_E_ELEMENTNOTFOUND; - *ppTInfo = (ITypeInfo*)This->typeinfos[index]; + *ppTInfo = (ITypeInfo *)&This->typeinfos[index]->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); return S_OK; @@ -4676,7 +4676,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoOfGuid( for(i = 0; i < This->TypeInfoCount; ++i){ if(IsEqualIID(TLB_get_guid_null(This->typeinfos[i]->guid), guid)){ - *ppTInfo = (ITypeInfo*)This->typeinfos[i]; + *ppTInfo = (ITypeInfo *)&This->typeinfos[i]->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); return S_OK; } @@ -4918,8 +4918,8 @@ static HRESULT WINAPI ITypeLib2_fnFindName( continue; ITypeLib2_fnFindName_exit: - ITypeInfo_AddRef((ITypeInfo*)pTInfo); - ppTInfo[count]=(LPTYPEINFO)pTInfo; + ITypeInfo2_AddRef(&pTInfo->ITypeInfo2_iface); + ppTInfo[count] = (ITypeInfo *)&pTInfo->ITypeInfo2_iface; count++; } TRACE("found %d typeinfos\n", count); @@ -5253,7 +5253,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( return hr; *pDescKind = DESCKIND_IMPLICITAPPOBJ; - *ppTInfo = (ITypeInfo *)pTypeInfo; + *ppTInfo = (ITypeInfo *)&pTypeInfo->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); return S_OK; } @@ -8195,7 +8195,7 @@ HRESULT WINAPI CreateDispTypeInfo( dump_TypeInfo(pTIClass); - *pptinfo = (ITypeInfo*)pTIClass; + *pptinfo = (ITypeInfo *)&pTIClass->ITypeInfo2_iface; ITypeInfo_AddRef(*pptinfo); ITypeLib2_Release(&pTypeLibImpl->ITypeLib2_iface); @@ -8208,21 +8208,21 @@ static HRESULT WINAPI ITypeComp_fnQueryInterface(ITypeComp * iface, REFIID riid, { ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); - return ITypeInfo_QueryInterface((ITypeInfo *)This, riid, ppv); + return ITypeInfo2_QueryInterface(&This->ITypeInfo2_iface, riid, ppv); } static ULONG WINAPI ITypeComp_fnAddRef(ITypeComp * iface) { ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); - return ITypeInfo_AddRef((ITypeInfo *)This); + return ITypeInfo2_AddRef(&This->ITypeInfo2_iface); } static ULONG WINAPI ITypeComp_fnRelease(ITypeComp * iface) { ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); - return ITypeInfo_Release((ITypeInfo *)This); + return ITypeInfo2_Release(&This->ITypeInfo2_iface); } static HRESULT WINAPI ITypeComp_fnBind(

1 0