wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Henri Verbeet : d3d10: Handle D3D10_SVT_UINT in read_int32_value() and read_int8_value().
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 0f372135bb9de3e96c92343f52257bb204765f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f372135bb9de3e96c92343f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 13:52:31 2012 +0200 d3d10: Handle D3D10_SVT_UINT in read_int32_value() and read_int8_value(). --- dlls/d3d10/effect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7d07cc3..5b82777 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1084,6 +1084,7 @@ static BOOL read_int32_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT return TRUE; case D3D10_SVT_INT: + case D3D10_SVT_UINT: case D3D10_SVT_BOOL: out_data[idx] = value; return TRUE; @@ -1099,6 +1100,7 @@ static BOOL read_int8_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT8 switch (in_type) { case D3D10_SVT_INT: + case D3D10_SVT_UINT: out_data[idx] = value; return TRUE;

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_get_wined3d().
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 66ec8a5cfb392e28d0feb5a9a42337eac1676117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ec8a5cfb392e28d0feb5a9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 13:52:30 2012 +0200 wined3d: Get rid of wined3d_device_get_wined3d(). --- dlls/wined3d/device.c | 12 ------------ dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 3 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0826957..ba8c4be 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1567,18 +1567,6 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device) device->create_parms.flags |= WINED3DCREATE_MULTITHREADED; } -HRESULT CDECL wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d) -{ - TRACE("device %p, wined3d %p.\n", device, wined3d); - - *wined3d = device->wined3d; - wined3d_incref(*wined3d); - - TRACE("Returning %p.\n", *wined3d); - - return WINED3D_OK; -} - UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device) { TRACE("device %p.\n", device); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index eed1174..6555ae8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -94,7 +94,6 @@ @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) -@ cdecl wined3d_device_get_wined3d(ptr ptr) @ cdecl wined3d_device_incref(ptr) @ cdecl wined3d_device_init_3d(ptr ptr) @ cdecl wined3d_device_init_gdi(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4a11ff2..941bd8e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2176,7 +2176,6 @@ HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *devi UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); -HRESULT __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc);

1 0

Hans Leidekker : wbemprox: Implement Win32_ComputerSystem.DomainRole.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 5c074732d5b610467f6d9e939d2c6365f483a282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c074732d5b610467f6d9e939… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 4 13:49:57 2012 +0200 wbemprox: Implement Win32_ComputerSystem.DomainRole. --- 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 29d7392..e3a5e6d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -97,6 +97,8 @@ static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR prop_displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; +static const WCHAR prop_domainroleW[] = + {'D','o','m','a','i','n','R','o','l','e',0}; static const WCHAR prop_drivetypeW[] = {'D','r','i','v','e','T','y','p','e',0}; static const WCHAR prop_filesystemW[] = @@ -199,6 +201,7 @@ static const struct column col_bios[] = static const struct column col_compsys[] = { { prop_descriptionW, CIM_STRING }, + { prop_domainroleW, CIM_UINT16 }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, @@ -339,6 +342,7 @@ struct record_bios struct record_computersystem { const WCHAR *description; + UINT16 domainrole; const WCHAR *manufacturer; const WCHAR *model; UINT32 num_logical_processors; @@ -488,6 +492,7 @@ static void fill_compsys( struct table *table ) rec = (struct record_computersystem *)table->data; rec->description = compsys_descriptionW; + rec->domainrole = 0; /* standalone workstation */ rec->manufacturer = compsys_manufacturerW; rec->model = compsys_modelW; rec->num_logical_processors = get_processor_count();

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::GetObjectText.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: a568d08c5f7ac1ea4abf8559966be0ac1ec4a9d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a568d08c5f7ac1ea4abf85599… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 4 13:49:40 2012 +0200 wbemprox: Implement IWbemClassObject::GetObjectText. --- dlls/wbemprox/class.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 030aed5..c0a8cd9 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -417,13 +417,68 @@ static HRESULT WINAPI class_object_Clone( return E_NOTIMPL; } +static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) +{ + static const WCHAR fmtW[] = {'\n','\t','%','s',' ','=',' ','%','s',';',0}; + BSTR value, ret; + WCHAR *p; + UINT i; + + *len = 0; + for (i = 0; i < table->num_cols; i++) + { + *len += sizeof(fmtW) / sizeof(fmtW[0]); + *len += strlenW( table->columns[i].name ); + value = get_value_bstr( table, row, i ); + *len += SysStringLen( value ); + SysFreeString( value ); + } + if (!(ret = SysAllocStringLen( NULL, *len ))) return NULL; + p = ret; + for (i = 0; i < table->num_cols; i++) + { + value = get_value_bstr( table, row, i ); + p += sprintfW( p, fmtW, table->columns[i].name, value ); + SysFreeString( value ); + } + return ret; +} + +static BSTR get_object_text( const struct view *view, UINT index ) +{ + static const WCHAR fmtW[] = + {'\n','i','n','s','t','a','n','c','e',' ','o','f',' ','%','s','\n','{','%','s','\n','}',';',0}; + UINT len, len_body, row = view->result[index]; + BSTR ret, body; + + len = sizeof(fmtW) / sizeof(fmtW[0]); + len += strlenW( view->table->name ); + if (!(body = get_body_text( view->table, row, &len_body ))) return NULL; + len += len_body; + + if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; + sprintfW( ret, fmtW, view->table->name, body ); + SysFreeString( body ); + return ret; +} + static HRESULT WINAPI class_object_GetObjectText( IWbemClassObject *iface, LONG lFlags, BSTR *pstrObjectText ) { - FIXME("%p, %08x, %p\n", iface, lFlags, pstrObjectText); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); + struct view *view = ec->query->view; + BSTR text; + + TRACE("%p, %08x, %p\n", iface, lFlags, pstrObjectText); + + if (lFlags) FIXME("flags %08x not implemented\n", lFlags); + + if (!(text = get_object_text( view, co->index ))) return E_OUTOFMEMORY; + *pstrObjectText = text; + return S_OK; } static HRESULT WINAPI class_object_SpawnDerivedClass(

1 0

Hans Leidekker : wbemprox: Add support for boolean values in get_value_bstr .
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 4e2c2e5a6451314cac87289818db3253dc1becc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2c2e5a6451314cac8728981… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 4 13:49:24 2012 +0200 wbemprox: Add support for boolean values in get_value_bstr. --- dlls/wbemprox/table.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 6b584ff..c6dc845 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -144,6 +144,8 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) static const WCHAR fmt_signed64W[] = {'%','I','6','4','d',0}; static const WCHAR fmt_unsigned64W[] = {'%','I','6','4','u',0}; static const WCHAR fmt_strW[] = {'\"','%','s','\"',0}; + static const WCHAR trueW[] = {'T','R','U','E',0}; + static const WCHAR falseW[] = {'F','A','L','S','E',0}; LONGLONG val; BSTR ret; WCHAR number[22]; @@ -158,6 +160,10 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) switch (table->columns[column].type & COL_TYPE_MASK) { + case CIM_BOOLEAN: + if (val) return SysAllocString( trueW ); + else return SysAllocString( falseW ); + case CIM_DATETIME: case CIM_STRING: len = strlenW( (const WCHAR *)(INT_PTR)val ) + 2;

1 0

Hans Leidekker : wbemprox: Add a function to query the service configuration.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: bbb823f8c2aa16c56f82ebcdb6813cbf1e91109a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb823f8c2aa16c56f82ebcdb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 4 13:49:11 2012 +0200 wbemprox: Add a function to query the service configuration. --- dlls/wbemprox/builtin.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1016ca5..29d7392 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -880,6 +880,25 @@ static const WCHAR *get_service_startmode( DWORD mode ) } } +static QUERY_SERVICE_CONFIGW *query_service_config( SC_HANDLE manager, const WCHAR *name ) +{ + QUERY_SERVICE_CONFIGW *config = NULL; + SC_HANDLE service; + DWORD size; + + if (!(service = OpenServiceW( manager, name, SERVICE_QUERY_CONFIG ))) return NULL; + QueryServiceConfigW( service, NULL, 0, &size ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto done; + if (!(config = heap_alloc( size ))) goto done; + if (QueryServiceConfigW( service, config, size, &size )) goto done; + heap_free( config ); + config = NULL; + +done: + CloseServiceHandle( service ); + return config; +} + static void fill_service( struct table *table ) { struct record_service *rec; @@ -915,27 +934,8 @@ static void fill_service( struct table *table ) for (i = 0; i < count; i++) { QUERY_SERVICE_CONFIGW *config; - SC_HANDLE service; - DWORD startmode; - DWORD size; - - service = OpenServiceW(manager, services[i].lpServiceName, GENERIC_READ); - QueryServiceConfigW(service, NULL, 0, &size); - config = heap_alloc(size); - if (!config) - { - CloseServiceHandle(service); - break; - } - if (QueryServiceConfigW(service, config, size, &size)) - startmode = config->dwStartType; - else - { - ERR("failed to get %s service config data\n", debugstr_w(services[i].lpServiceName)); - startmode = SERVICE_DISABLED; - } - CloseServiceHandle(service); - heap_free(config); + + if (!(config = query_service_config( manager, services[i].lpServiceName ))) continue; status = &services[i].ServiceStatusProcess; rec = (struct record_service *)(table->data + offset); @@ -945,9 +945,10 @@ static void fill_service( struct table *table ) rec->name = heap_strdupW( services[i].lpServiceName ); rec->process_id = status->dwProcessId; rec->servicetype = get_service_type( status->dwServiceType ); - rec->startmode = get_service_startmode( startmode ); + rec->startmode = get_service_startmode( config->dwStartType ); rec->state = get_service_state( status->dwCurrentState ); rec->systemname = heap_strdupW( sysnameW ); + heap_free( config ); offset += sizeof(*rec); num_rows++; }

1 0

Hans Leidekker : wbemprox: Get rid of a duplicate string constant.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: d582950db28d8cde40c95cc2a8b4eb4926847b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d582950db28d8cde40c95cc2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 4 13:48:54 2012 +0200 wbemprox: Get rid of a duplicate string constant. --- dlls/wbemprox/builtin.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 01a7da4..1016ca5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -111,6 +111,8 @@ static const WCHAR prop_macaddressW[] = {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; +static const WCHAR prop_maxclockspeedW[] = + {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; static const WCHAR prop_methodW[] = {'M','e','t','h','o','d',0}; static const WCHAR prop_modelW[] = @@ -163,10 +165,6 @@ static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_typeW[] = {'T','y','p','e',0}; -static const WCHAR prop_maxclockspeedW[] = - {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; -static const WCHAR prop_numberoflogicalprocessorsW[] = - {'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 method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -253,13 +251,13 @@ static const struct column col_process[] = }; static const struct column col_processor[] = { - { prop_cpustatusW, CIM_UINT16 }, - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_maxclockspeedW, CIM_UINT32 }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_numberoflogicalprocessorsW, CIM_UINT32 }, - { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_cpustatusW, CIM_UINT16 }, + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_maxclockspeedW, CIM_UINT32 }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_numlogicalprocessorsW, CIM_UINT32 }, + { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_service[] = {

1 0

Rico Schüller : d3dx9: Remove ID3DXMatrixStackImpl typedef.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 6268414cab8a5f84f4c7f2e06c570e4e23f8e2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6268414cab8a5f84f4c7f2e06… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Sep 4 09:44:57 2012 +0200 d3dx9: Remove ID3DXMatrixStackImpl typedef. --- dlls/d3dx9_36/math.c | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 81c0b65..4a477ec 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl; -typedef struct ID3DXMatrixStackImpl +struct ID3DXMatrixStackImpl { ID3DXMatrixStack ID3DXMatrixStack_iface; LONG ref; @@ -45,7 +45,7 @@ typedef struct ID3DXMatrixStackImpl unsigned int current; unsigned int stack_size; D3DXMATRIX *stack; -} ID3DXMatrixStackImpl; +}; /*_________________D3DXColor____________________*/ @@ -835,9 +835,9 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) static const unsigned int INITIAL_STACK_SIZE = 32; -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK *ppstack) { - ID3DXMatrixStackImpl* object; + struct ID3DXMatrixStackImpl *object; TRACE("flags %#x, ppstack %p\n", flags, ppstack); @@ -868,9 +868,9 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) return D3D_OK; } -static inline ID3DXMatrixStackImpl *impl_from_ID3DXMatrixStack(ID3DXMatrixStack *iface) +static inline struct ID3DXMatrixStackImpl *impl_from_ID3DXMatrixStack(ID3DXMatrixStack *iface) { - return CONTAINING_RECORD(iface, ID3DXMatrixStackImpl, ID3DXMatrixStack_iface); + return CONTAINING_RECORD(iface, struct ID3DXMatrixStackImpl, ID3DXMatrixStack_iface); } static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *iface, REFIID riid, void **out) @@ -893,15 +893,15 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *ifac static ULONG WINAPI ID3DXMatrixStackImpl_AddRef(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) : AddRef from %d\n", This, ref - 1); return ref; } -static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack* iface) +static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref) { @@ -914,7 +914,7 @@ static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack* iface) static D3DXMATRIX* WINAPI ID3DXMatrixStackImpl_GetTop(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -923,7 +923,7 @@ static D3DXMATRIX* WINAPI ID3DXMatrixStackImpl_GetTop(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -934,7 +934,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -945,7 +945,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -956,7 +956,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -967,7 +967,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *ifa static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -995,7 +995,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1023,7 +1023,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1036,7 +1036,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1049,7 +1049,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *ifa static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1062,7 +1062,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack * static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1075,7 +1075,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixSt static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1088,7 +1088,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1101,7 +1101,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, F static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1114,7 +1114,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FL static HRESULT WINAPI ID3DXMatrixStackImpl_TranslateLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface);

1 0

Rico Schüller : d3dx9: Use sizeof variable instead of type.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 27b7fdf66339b2c638bbf361832577569a4fde71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b7fdf66339b2c638bbf3618… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Sep 4 09:44:51 2012 +0200 d3dx9: Use sizeof variable instead of type. --- dlls/d3dx9_36/math.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index cea4bdf..81c0b65 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -841,16 +841,16 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) TRACE("flags %#x, ppstack %p\n", flags, ppstack); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXMatrixStackImpl)); - if ( object == NULL ) + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (object == NULL) { - *ppstack = NULL; - return E_OUTOFMEMORY; + *ppstack = NULL; + return E_OUTOFMEMORY; } object->ID3DXMatrixStack_iface.lpVtbl = &ID3DXMatrixStack_Vtbl; object->ref = 1; - object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(D3DXMATRIX)); + object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(*object->stack)); if (!object->stack) { HeapFree(GetProcessHeap(), 0, object); @@ -980,7 +980,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) D3DXMATRIX *new_stack; new_size = This->stack_size / 2; - new_stack = HeapReAlloc(GetProcessHeap(), 0, This->stack, new_size * sizeof(D3DXMATRIX)); + new_stack = HeapReAlloc(GetProcessHeap(), 0, This->stack, new_size * sizeof(*new_stack)); if (new_stack) { This->stack_size = new_size; @@ -1007,7 +1007,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) if (This->stack_size > UINT_MAX / 2) return E_OUTOFMEMORY; new_size = This->stack_size * 2; - new_stack = HeapReAlloc(GetProcessHeap(), 0, This->stack, new_size * sizeof(D3DXMATRIX)); + new_stack = HeapReAlloc(GetProcessHeap(), 0, This->stack, new_size * sizeof(*new_stack)); if (!new_stack) return E_OUTOFMEMORY; This->stack_size = new_size;

1 0

Rico Schüller : d3dx9: Make '\0' the default case in get_constant_by_name().
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 7d08ae9b29fae7831d03c19d9f605f8166bd5804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d08ae9b29fae7831d03c19d9… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Sep 4 09:44:38 2012 +0200 d3dx9: Make '\0' the default case in get_constant_by_name(). --- dlls/d3dx9_36/shader.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 5745884..c62c8e5 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -752,7 +752,7 @@ static struct ctab_constant *get_constant_by_name(struct ID3DXConstantTableImpl handles = constant->constants; } - length = strcspn( name, "[." ); + length = strcspn(name, "[."); part = name + length; for (i = 0; i < count; i++) @@ -767,13 +767,9 @@ static struct ctab_constant *get_constant_by_name(struct ID3DXConstantTableImpl case '[': return get_constant_element_by_name(&handles[i], part); - case '\0': + default: TRACE("Returning parameter %p\n", &handles[i]); return &handles[i]; - - default: - FIXME("Unhandled case \"%c\"\n", *--part); - break; } } }

1 0

← Newer
1
...
75
76
77
78
79
80
81
82
83
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 September 2012