September 2012 - Wine-Commits

Henri Verbeet : d3d10core: Implement d3d10_shader_resource_view_GetDesc().
by Alexandre Julliard Sept. 14, 2012

Sept. 14, 2012

Module: wine Branch: master Commit: 83e21f8793ac906941409634ec797d3f3648adad URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e21f8793ac906941409634e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 14 13:11:31 2012 +0200 d3d10core: Implement d3d10_shader_resource_view_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 3 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/view.c | 140 +++++++++++++++++++++++++++++++++++- 3 files changed, 141 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 25fda7c..f88355b 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -157,11 +157,12 @@ struct d3d10_shader_resource_view ID3D10ShaderResourceView ID3D10ShaderResourceView_iface; LONG refcount; + D3D10_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; }; HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, - ID3D10Resource *resource) DECLSPEC_HIDDEN; + ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; /* ID3D10InputLayout */ struct d3d10_input_layout diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index e6c26c2..ebfd4cf 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -746,7 +746,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_shader_resource_view_init(object, resource))) + if (FAILED(hr = d3d10_shader_resource_view_init(object, resource, desc))) { WARN("Failed to initialize shader resource view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 40712fc..b36f9d7 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -259,6 +259,126 @@ static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3 } } +static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10Resource *resource) +{ + D3D10_RESOURCE_DIMENSION dimension; + HRESULT hr; + + ID3D10Resource_GetType(resource, &dimension); + + switch (dimension) + { + case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + { + D3D10_TEXTURE1D_DESC texture_desc; + ID3D10Texture1D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + { + ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + ID3D10Texture1D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE1D; + desc->u.Texture1D.MostDetailedMip = 0; + desc->u.Texture1D.MipLevels = texture_desc.MipLevels; + } + else + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE1DARRAY; + desc->u.Texture1DArray.MostDetailedMip = 0; + desc->u.Texture1DArray.MipLevels = texture_desc.MipLevels; + desc->u.Texture1DArray.FirstArraySlice = 0; + desc->u.Texture1DArray.ArraySize = texture_desc.ArraySize; + } + + return S_OK; + } + + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + { + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + { + ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + ID3D10Texture2D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; + desc->u.Texture2D.MostDetailedMip = 0; + desc->u.Texture2D.MipLevels = texture_desc.MipLevels; + } + else + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DMS; + } + } + else + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DARRAY; + desc->u.Texture2DArray.MostDetailedMip = 0; + desc->u.Texture2DArray.MipLevels = texture_desc.MipLevels; + desc->u.Texture2DArray.FirstArraySlice = 0; + desc->u.Texture2DArray.ArraySize = texture_desc.ArraySize; + } + else + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY; + desc->u.Texture2DMSArray.FirstArraySlice = 0; + desc->u.Texture2DMSArray.ArraySize = texture_desc.ArraySize; + } + } + + return S_OK; + } + + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + { + D3D10_TEXTURE3D_DESC texture_desc; + ID3D10Texture3D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture))) + { + ERR("Resource of type TEXTURE3D doesn't implement ID3D10Texture3D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture3D_GetDesc(texture, &texture_desc); + ID3D10Texture3D_Release(texture); + + desc->Format = texture_desc.Format; + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE3D; + desc->u.Texture3D.MostDetailedMip = 0; + desc->u.Texture3D.MipLevels = texture_desc.MipLevels; + + return S_OK; + } + + default: + FIXME("Unhandled resource dimension %#x.\n", dimension); + case D3D10_RESOURCE_DIMENSION_BUFFER: + return E_INVALIDARG; + } +} + static inline struct d3d10_depthstencil_view *impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) { return CONTAINING_RECORD(iface, struct d3d10_depthstencil_view, ID3D10DepthStencilView_iface); @@ -696,7 +816,11 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetResource(ID3D10Shade static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDesc(ID3D10ShaderResourceView *iface, D3D10_SHADER_RESOURCE_VIEW_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = view->desc; } static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl = @@ -717,11 +841,23 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl }; HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, - ID3D10Resource *resource) + ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) { + HRESULT hr; + view->ID3D10ShaderResourceView_iface.lpVtbl = &d3d10_shader_resource_view_vtbl; view->refcount = 1; + if (!desc) + { + if (FAILED(hr = set_srdesc_from_resource(&view->desc, resource))) + return hr; + } + else + { + view->desc = *desc; + } + view->resource = resource; ID3D10Resource_AddRef(resource);

1 0

Henri Verbeet : wined3d: wined3d_device_multiply_transform() never fails.
by Alexandre Julliard Sept. 14, 2012

Sept. 14, 2012

Module: wine Branch: master Commit: 90bd04c6b650ca1e7e4546f531a0a5fde7917e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bd04c6b650ca1e7e4546f53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 14 13:11:33 2012 +0200 wined3d: wined3d_device_multiply_transform() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/device.c | 8 +++----- include/wine/wined3d.h | 2 +- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1ccaf2d..e5c2605 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1291,16 +1291,15 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface, D3DTRANSFORMSTATETYPE state, const D3DMATRIX *matrix) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - hr = wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); + wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3DVIEWPORT8 *viewport) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d50961a..3bbdd78 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1357,16 +1357,15 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface, D3DTRANSFORMSTATETYPE state, const D3DMATRIX *matrix) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - hr = wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); + wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D3DVIEWPORT9 *viewport) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f321374..f0bd56a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3299,7 +3299,6 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); enum wined3d_transform_state wined3d_state; - HRESULT hr; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); @@ -3323,11 +3322,11 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - hr = wined3d_device_multiply_transform(device->wined3d_device, + wined3d_device_multiply_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d_device7_MultiplyTransform_FPUSetup(IDirect3DDevice7 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e5cf69b..903d589 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1763,10 +1763,10 @@ void CDECL wined3d_device_get_transform(const struct wined3d_device *device, *matrix = device->stateBlock->state.transforms[state]; } -HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device, +void CDECL wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix) { - const struct wined3d_matrix *mat = NULL; + const struct wined3d_matrix *mat; struct wined3d_matrix temp; TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix); @@ -1778,7 +1778,7 @@ HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device, if (state > HIGHEST_TRANSFORMSTATE) { WARN("Unhandled transform state %#x.\n", state); - return WINED3D_OK; + return; } mat = &device->updateStateBlock->state.transforms[state]; @@ -1786,8 +1786,6 @@ HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device, /* Apply change via set transform - will reapply to eg. lights this way. */ wined3d_device_set_transform(device, state, &temp); - - return WINED3D_OK; } /* Note lights are real special cases. Although the device caps state only diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 478abe0..c3e1c19 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2177,7 +2177,7 @@ HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *devi 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); -HRESULT __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, +void __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); HRESULT __cdecl wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags);

1 0

Piotr Caban : msvcp90: Fixed _Getcat return type.
by Alexandre Julliard Sept. 14, 2012

Sept. 14, 2012

Module: wine Branch: master Commit: fbd77651873793d6ba98f4d80f57c9dd68647296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd77651873793d6ba98f4d80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 14 12:43:25 2012 +0200 msvcp90: Fixed _Getcat return type. --- dlls/msvcp100/locale.c | 10 +++++----- dlls/msvcp90/locale.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index e1abed8..ccf6297 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -2935,7 +2935,7 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne /* ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -2987,7 +2987,7 @@ codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) /* ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6172,7 +6172,7 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6819,7 +6819,7 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6843,7 +6843,7 @@ unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const loc /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ddf1424..5cca3e0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3046,7 +3046,7 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne /* ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -3098,7 +3098,7 @@ codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) /* ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6315,7 +6315,7 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6962,7 +6962,7 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6986,7 +6986,7 @@ unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const loc /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc);

1 0

Henri Verbeet : wined3d: Just handle all instructions in the shader backend .
by Alexandre Julliard Sept. 14, 2012

Sept. 14, 2012

Module: wine Branch: master Commit: a7bad0bde5077c3c469cc2de2f7b6b887637bc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7bad0bde5077c3c469cc2de2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 14 13:11:34 2012 +0200 wined3d: Just handle all instructions in the shader backend. --- dlls/wined3d/arb_program_shader.c | 16 ++++++---------- dlls/wined3d/glsl_shader.c | 14 ++++++++------ dlls/wined3d/shader.c | 9 --------- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c4064b9..cb94d6e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1786,11 +1786,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s%s %s%s;\n", instruction, shader_arb_get_modifier(ins), dst_str, arguments); } -static void shader_hw_nop(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - shader_addline(buffer, "NOP;\n"); -} +static void shader_hw_nop(const struct wined3d_shader_instruction *ins) {} static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { @@ -5102,10 +5098,10 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CND */ pshader_hw_cnd, /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, - /* WINED3DSIH_DCL */ NULL, - /* WINED3DSIH_DEF */ NULL, - /* WINED3DSIH_DEFB */ NULL, - /* WINED3DSIH_DEFI */ NULL, + /* WINED3DSIH_DCL */ shader_hw_nop, + /* WINED3DSIH_DEF */ shader_hw_nop, + /* WINED3DSIH_DEFB */ shader_hw_nop, + /* WINED3DSIH_DEFI */ shader_hw_nop, /* WINED3DSIH_DIV */ NULL, /* WINED3DSIH_DP2ADD */ pshader_hw_dp2add, /* WINED3DSIH_DP3 */ shader_hw_map2gl, @@ -5153,7 +5149,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_MUL */ shader_hw_map2gl, /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, - /* WINED3DSIH_PHASE */ NULL, + /* WINED3DSIH_PHASE */ shader_hw_nop, /* WINED3DSIH_POW */ shader_hw_pow, /* WINED3DSIH_RCP */ shader_hw_rcp, /* WINED3DSIH_REP */ shader_hw_rep, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 66c30f8..fe961b9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2301,6 +2301,8 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "));\n"); } +static void shader_glsl_nop(const struct wined3d_shader_instruction *ins) {} + static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; @@ -5028,10 +5030,10 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ NULL, - /* WINED3DSIH_DCL */ NULL, - /* WINED3DSIH_DEF */ NULL, - /* WINED3DSIH_DEFB */ NULL, - /* WINED3DSIH_DEFI */ NULL, + /* WINED3DSIH_DCL */ shader_glsl_nop, + /* WINED3DSIH_DEF */ shader_glsl_nop, + /* WINED3DSIH_DEFB */ shader_glsl_nop, + /* WINED3DSIH_DEFI */ shader_glsl_nop, /* WINED3DSIH_DIV */ NULL, /* WINED3DSIH_DP2ADD */ shader_glsl_dp2add, /* WINED3DSIH_DP3 */ shader_glsl_dot, @@ -5077,9 +5079,9 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MOVA */ shader_glsl_mov, /* WINED3DSIH_MOVC */ NULL, /* WINED3DSIH_MUL */ shader_glsl_arith, - /* WINED3DSIH_NOP */ NULL, + /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm, - /* WINED3DSIH_PHASE */ NULL, + /* WINED3DSIH_PHASE */ shader_glsl_nop, /* WINED3DSIH_POW */ shader_glsl_pow, /* WINED3DSIH_RCP */ shader_glsl_rcp, /* WINED3DSIH_REP */ shader_glsl_rep, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7e282aa..6bb3b5b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1206,15 +1206,6 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_sh continue; } - /* Nothing to do. */ - if (ins.handler_idx == WINED3DSIH_DCL - || ins.handler_idx == WINED3DSIH_NOP - || ins.handler_idx == WINED3DSIH_DEF - || ins.handler_idx == WINED3DSIH_DEFI - || ins.handler_idx == WINED3DSIH_DEFB - || ins.handler_idx == WINED3DSIH_PHASE) - continue; - if (ins.predicate) FIXME("Predicates not implemented.\n");

1 0

Jacek Caban : textstor.idl: Added TS_ST_CORRECTION declaration.
by Alexandre Julliard Sept. 14, 2012

Sept. 14, 2012

Module: wine Branch: master Commit: 556076dcbe3bde631e97ca619238b8f57fee1319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=556076dcbe3bde631e97ca619… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 14 14:53:14 2012 +0200 textstor.idl: Added TS_ST_CORRECTION declaration. --- include/textstor.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/textstor.idl b/include/textstor.idl index 25f7749..5928569 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -64,6 +64,8 @@ const WCHAR TS_CHAR_REPLACEMENT = 0xfffd; const DWORD TS_IAS_NOQUERY = 0x1; const DWORD TS_IAS_QUERYONLY = 0x2; +const DWORD TS_ST_CORRECTION = 0x1; + typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd; typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType; typedef [uuid(ef3457d9-8446-49a7-a9e6-b50d9d5f3fd9)] GUID TS_ATTRID;

1 0

Jörg Höhle : mciseq: Remove superfluous NULL pointer check.
by Alexandre Julliard Sept. 14, 2012

Sept. 14, 2012

Module: wine Branch: master Commit: 5b3121b63265a34d36eabecca1ad0108f1be633a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3121b63265a34d36eabecca… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jul 19 09:15:15 2011 +0200 mciseq: Remove superfluous NULL pointer check. --- dlls/mciseq/mcimidi.c | 38 ++++++++++++++------------------------ 1 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 2783c07..e0d8164 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -231,8 +231,7 @@ static DWORD MIDI_mciReadByte(WINE_MCIMIDI* wmm, BYTE *lpbyt) { DWORD ret = 0; - if (lpbyt == NULL || - mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != (long)sizeof(BYTE)) { + if (mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != (long)sizeof(BYTE)) { WARN("Error reading wmm=%p\n", wmm); ret = MCIERR_INVALID_FILE; } @@ -248,8 +247,7 @@ static DWORD MIDI_mciReadWord(WINE_MCIMIDI* wmm, LPWORD lpw) BYTE hibyte, lobyte; DWORD ret = MCIERR_INVALID_FILE; - if (lpw != NULL && - MIDI_mciReadByte(wmm, &hibyte) == 0 && + if (MIDI_mciReadByte(wmm, &hibyte) == 0 && MIDI_mciReadByte(wmm, &lobyte) == 0) { *lpw = ((WORD)hibyte << 8) + lobyte; ret = 0; @@ -265,8 +263,7 @@ static DWORD MIDI_mciReadLong(WINE_MCIMIDI* wmm, LPDWORD lpdw) WORD hiword, loword; DWORD ret = MCIERR_INVALID_FILE; - if (lpdw != NULL && - MIDI_mciReadWord(wmm, &hiword) == 0 && + if (MIDI_mciReadWord(wmm, &hiword) == 0 && MIDI_mciReadWord(wmm, &loword) == 0) { *lpdw = MAKELONG(loword, hiword); ret = 0; @@ -281,24 +278,17 @@ static WORD MIDI_mciReadVaryLen(WINE_MCIMIDI* wmm, LPDWORD lpdw) { BYTE byte; DWORD value = 0; - WORD ret = 0; + WORD len = 0; - if (lpdw == NULL) { - ret = MCIERR_INVALID_FILE; - } else { - do { - if (MIDI_mciReadByte(wmm, &byte) != 0) { - return 0; - } - value = (value << 7) + (byte & 0x7F); - ret++; - } while (byte & 0x80); - *lpdw = value; - /* - TRACE("val=%08X\n", value); - */ - } - return ret; + do { + if (MIDI_mciReadByte(wmm, &byte) != 0) { + return 0; + } + value = (value << 7) + (byte & 0x7F); + len++; + } while (byte & 0x80); + *lpdw = value; + return len; } /**************************************************************************

1 0

Piotr Caban : msvcp90: Remove unused thiscall functions.
by Alexandre Julliard Sept. 14, 2012

Sept. 14, 2012

Module: wine Branch: master Commit: f8350fc15b8bebdd1f8af84ccbbba7d63618b5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8350fc15b8bebdd1f8af84cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 14 12:44:29 2012 +0200 msvcp90: Remove unused thiscall functions. --- dlls/msvcp90/exception.c | 24 ++++++++---------------- dlls/msvcp90/locale.c | 20 -------------------- 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 6aa3c0d..d684140 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -98,8 +98,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ); -DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8) -exception* __thiscall MSVCP_exception_ctor(exception *this, const char **name) +static exception* MSVCP_exception_ctor(exception *this, const char **name) { TRACE("(%p %s)\n", this, *name); @@ -189,8 +188,7 @@ static const cxx_exception_type exception_cxx_type = { /* bad_alloc class data */ typedef exception bad_alloc; -DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_ctor, 8) -bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name) +static bad_alloc* MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name) { TRACE("%p %s\n", this, *name); MSVCP_exception_ctor(this, name); @@ -273,8 +271,7 @@ typedef struct _logic_error { basic_string_char str; } logic_error; -DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor, 8) -logic_error* __thiscall MSVCP_logic_error_ctor( +static logic_error* MSVCP_logic_error_ctor( logic_error *this, const char **name) { TRACE("%p %s\n", this, *name); @@ -361,8 +358,7 @@ static const cxx_exception_type logic_error_cxx_type = { /* length_error class data */ typedef logic_error length_error; -DEFINE_THISCALL_WRAPPER(MSVCP_length_error_ctor, 8) -length_error* __thiscall MSVCP_length_error_ctor( +static length_error* MSVCP_length_error_ctor( length_error *this, const char **name) { TRACE("%p %s\n", this, *name); @@ -410,8 +406,7 @@ static const cxx_exception_type length_error_cxx_type = { /* out_of_range class data */ typedef logic_error out_of_range; -DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_ctor, 8) -out_of_range* __thiscall MSVCP_out_of_range_ctor( +static out_of_range* MSVCP_out_of_range_ctor( out_of_range *this, const char **name) { TRACE("%p %s\n", this, *name); @@ -459,8 +454,7 @@ static const cxx_exception_type out_of_range_cxx_type = { /* invalid_argument class data */ typedef logic_error invalid_argument; -DEFINE_THISCALL_WRAPPER(MSVCP_invalid_argument_ctor, 8) -invalid_argument* __thiscall MSVCP_invalid_argument_ctor( +static invalid_argument* MSVCP_invalid_argument_ctor( invalid_argument *this, const char **name) { TRACE("%p %s\n", this, *name); @@ -511,8 +505,7 @@ typedef struct { basic_string_char str; } runtime_error; -DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_ctor, 8) -runtime_error* __thiscall MSVCP_runtime_error_ctor( +static runtime_error* MSVCP_runtime_error_ctor( runtime_error *this, const char **name) { TRACE("%p %s\n", this, *name); @@ -599,8 +592,7 @@ static const cxx_exception_type runtime_error_cxx_type = { /* failure class data */ typedef runtime_error failure; -DEFINE_THISCALL_WRAPPER(MSVCP_failure_ctor, 8) -failure* __thiscall MSVCP_failure_ctor( +static failure* MSVCP_failure_ctor( failure *this, const char **name) { TRACE("%p %s\n", this, *name); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5cca3e0..a2b37a7 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -8356,26 +8356,6 @@ void __thiscall locale_dtor(locale *this) locale__Locimp_dtor(this->ptr); } -DEFINE_THISCALL_WRAPPER(locale_vector_dtor, 8) -locale* __thiscall locale_vector_dtor(locale *this, unsigned int flags) -{ - TRACE("(%p %x)\n", this, flags); - if(flags & 2) { - /* we have an array, with the number of elements stored before the first object */ - INT_PTR i, *ptr = (INT_PTR *)this-1; - - for(i=*ptr-1; i>=0; i--) - locale_dtor(this+i); - MSVCRT_operator_delete(ptr); - } else { - locale_dtor(this); - if(flags & 1) - MSVCRT_operator_delete(this); - } - - return this; -} - /* ??4locale(a)std@@QAEAAV01(a)ABV01@@Z */ /* ??4locale(a)std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(locale_operator_assign, 8)

1 0

Bernhard Übelacker : mshtml: Check parameter load_group before calling RemoveRequest.
by Alexandre Julliard Sept. 14, 2012

Sept. 14, 2012

Module: wine Branch: master Commit: fdb7286a2c61ad1404f14771bf9c2bd66a716423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb7286a2c61ad1404f14771b… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Fri Sep 7 13:56:25 2012 +0200 mshtml: Check parameter load_group before calling RemoveRequest. --- dlls/mshtml/navigate.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4bed605..a15be0e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1310,10 +1310,12 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect(nsIAs } if(old_nschannel) { - nsres = nsILoadGroup_RemoveRequest(old_nschannel->load_group, - (nsIRequest*)&old_nschannel->nsIHttpChannel_iface, NULL, NS_OK); - if(NS_FAILED(nsres)) - ERR("RemoveRequest failed: %08x\n", nsres); + if(old_nschannel->load_group) { + nsres = nsILoadGroup_RemoveRequest(old_nschannel->load_group, + (nsIRequest*)&old_nschannel->nsIHttpChannel_iface, NULL, NS_OK); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08x\n", nsres); + } nsIHttpChannel_Release(&old_nschannel->nsIHttpChannel_iface); }

1 0

James Eder : ntdll: Add more complete implementation of NtPowerInformation.
by Alexandre Julliard Sept. 14, 2012

Sept. 14, 2012

Module: wine Branch: master Commit: 2a71712b51a7c17645f98dd6fdd377ecea7f7026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a71712b51a7c17645f98dd6f… Author: James Eder <jimportal(a)gmail.com> Date: Thu Sep 13 15:12:15 2012 -0600 ntdll: Add more complete implementation of NtPowerInformation. --- dlls/ntdll/nt.c | 169 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 139 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ca05203..878c58b 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -810,7 +810,6 @@ NTSTATUS WINAPI NtSetIntervalProfile( } static SYSTEM_CPU_INFORMATION cached_sci; -static ULONGLONG cpuHz = 1000000000; /* default to a 1GHz */ #define AUTH 0x68747541 /* "Auth" */ #define ENTI 0x69746e65 /* "enti" */ @@ -901,7 +900,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) * fill_cpu_info * * inits a couple of places with CPU related information: - * - cached_sci & cpuHZ in this file + * - cached_sci in this file * - Peb->NumberOfProcessors * - SharedUserData->ProcessFeatures[] array */ @@ -1019,16 +1018,6 @@ void fill_cpu_info(void) cached_sci.Revision = cached_sci.Revision | x; continue; } - if (!strcasecmp(line, "cpu MHz")) - { - double cmz; - if (sscanf( value, "%lf", &cmz ) == 1) - { - /* SYSTEMINFO doesn't have a slot for cpu speed, so store in a global */ - cpuHz = cmz * 1000 * 1000; - } - continue; - } if (!strcasecmp(line, "fdiv_bug")) { if (!strncasecmp(value, "yes",3)) @@ -1190,10 +1179,6 @@ void fill_cpu_info(void) ret = sysctlbyname("hw.ncpu", &num, &len, NULL, 0); if (!ret) NtCurrentTeb()->Peb->NumberOfProcessors = num; - - len = sizeof(num); - if (!sysctlbyname("hw.clockrate", &num, &len, NULL, 0)) - cpuHz = num * 1000 * 1000; } #elif defined(__sun) { @@ -1219,7 +1204,6 @@ void fill_cpu_info(void) #elif defined (__APPLE__) { size_t valSize; - unsigned long long longVal; int value; int cputype; char buffer[1024]; @@ -1300,9 +1284,6 @@ void fill_cpu_info(void) default: break; } /* switch (cputype) */ } - valSize = sizeof(longVal); - if (!sysctlbyname("hw.cpufrequency", &longVal, &valSize, NULL, 0)) - cpuHz = longVal; } #else FIXME("not yet supported on this system\n"); @@ -2261,7 +2242,35 @@ NTSTATUS WINAPI NtInitiatePowerAction( SystemAction,MinSystemState,Flags,Asynchronous); return STATUS_NOT_IMPLEMENTED; } - + +#ifdef linux +/* Fallback using /proc/cpuinfo for Linux systems without cpufreq. For + * most distributions on recent enough hardware, this is only likely to + * happen while running in virtualized environments such as QEMU. */ +static ULONG mhz_from_cpuinfo(void) +{ + char line[512]; + char *s, *value; + double cmz = 0; + FILE* f = fopen("/proc/cpuinfo", "r"); + if(f) { + while (fgets(line, sizeof(line), f) != NULL) { + if (!(value = strchr(line,':'))) + continue; + s = value - 1; + while ((s >= line) && isspace(*s)) s--; + *(s + 1) = '\0'; + value++; + if (!strcasecmp(line, "cpu MHz")) { + sscanf(value, " %lf", &cmz); + break; + } + } + fclose(f); + } + return cmz; +} +#endif /****************************************************************************** * NtPowerInformation [NTDLL.@] @@ -2326,24 +2335,124 @@ NTSTATUS WINAPI NtPowerInformation( return STATUS_SUCCESS; } case ProcessorInformation: { + const int cannedMHz = 1000; /* We fake a 1GHz processor if we can't conjure up real values */ PROCESSOR_POWER_INFORMATION* cpu_power = lpOutputBuffer; - int i; - - WARN("semi-stub: ProcessorInformation\n"); + int i, out_cpus; if ((lpOutputBuffer == NULL) || (nOutputBufferSize == 0)) return STATUS_INVALID_PARAMETER; - if ((nOutputBufferSize / sizeof(PROCESSOR_POWER_INFORMATION)) < NtCurrentTeb()->Peb->NumberOfProcessors) + out_cpus = NtCurrentTeb()->Peb->NumberOfProcessors; + if ((nOutputBufferSize / sizeof(PROCESSOR_POWER_INFORMATION)) < out_cpus) return STATUS_BUFFER_TOO_SMALL; - - for(i = 0; i < NtCurrentTeb()->Peb->NumberOfProcessors; i++) { +#if defined(linux) + { + char filename[128]; + FILE* f; + + for(i = 0; i < out_cpus; i++) { + sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", i); + f = fopen(filename, "r"); + if (f && (fscanf(f, "%d", &cpu_power[i].CurrentMhz) == 1)) { + cpu_power[i].CurrentMhz /= 1000; + fclose(f); + } + else { + if(i == 0) { + cpu_power[0].CurrentMhz = mhz_from_cpuinfo(); + if(cpu_power[0].CurrentMhz == 0) + cpu_power[0].CurrentMhz = cannedMHz; + } + else + cpu_power[i].CurrentMhz = cpu_power[0].CurrentMhz; + if(f) fclose(f); + } + + sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", i); + f = fopen(filename, "r"); + if (f && (fscanf(f, "%d", &cpu_power[i].MaxMhz) == 1)) { + cpu_power[i].MaxMhz /= 1000; + fclose(f); + } + else { + cpu_power[i].MaxMhz = cpu_power[i].CurrentMhz; + if(f) fclose(f); + } + + sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_max_freq", i); + f = fopen(filename, "r"); + if(f && (fscanf(f, "%d", &cpu_power[i].MhzLimit) == 1)) { + cpu_power[i].MhzLimit /= 1000; + fclose(f); + } + else + { + cpu_power[i].MhzLimit = cpu_power[i].MaxMhz; + if(f) fclose(f); + } + + cpu_power[i].Number = i; + cpu_power[i].MaxIdleState = 0; /* FIXME */ + cpu_power[i].CurrentIdleState = 0; /* FIXME */ + } + } +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) + { + int num; + size_t valSize = sizeof(num); + if (sysctlbyname("hw.clockrate", &num, &valSize, NULL, 0)) + num = cannedMHz; + for(i = 0; i < out_cpus; i++) { + cpu_power[i].CurrentMhz = num; + cpu_power[i].MaxMhz = num; + cpu_power[i].MhzLimit = num; + cpu_power[i].Number = i; + cpu_power[i].MaxIdleState = 0; /* FIXME */ + cpu_power[i].CurrentIdleState = 0; /* FIXME */ + } + } +#elif defined (__APPLE__) + { + size_t valSize; + unsigned long long currentMhz; + unsigned long long maxMhz; + + valSize = sizeof(currentMhz); + if (!sysctlbyname("hw.cpufrequency", &currentMhz, &valSize, NULL, 0)) + currentMhz /= 1000000; + else + currentMhz = cannedMHz; + + valSize = sizeof(maxMhz); + if (!sysctlbyname("hw.cpufrequency_max", &maxMhz, &valSize, NULL, 0)) + maxMhz /= 1000000; + else + maxMhz = currentMhz; + + for(i = 0; i < out_cpus; i++) { + cpu_power[i].CurrentMhz = currentMhz; + cpu_power[i].MaxMhz = maxMhz; + cpu_power[i].MhzLimit = maxMhz; + cpu_power[i].Number = i; + cpu_power[i].MaxIdleState = 0; /* FIXME */ + cpu_power[i].CurrentIdleState = 0; /* FIXME */ + } + } +#else + for(i = 0; i < out_cpus; i++) { + cpu_power[i].CurrentMhz = cannedMHz; + cpu_power[i].MaxMhz = cannedMHz; + cpu_power[i].MhzLimit = cannedMHz; cpu_power[i].Number = i; - cpu_power[i].MaxMhz = cpuHz / 1000000; - cpu_power[i].CurrentMhz = cpuHz / 1000000; - cpu_power[i].MhzLimit = cpuHz / 1000000; cpu_power[i].MaxIdleState = 0; /* FIXME */ cpu_power[i].CurrentIdleState = 0; /* FIXME */ } + WARN("Unable to detect CPU MHz for this platform. Reporting %d MHz.\n", cannedMHz); +#endif + for(i = 0; i < out_cpus; i++) { + TRACE("cpu_power[%d] = %u %u %u %u %u %u\n", i, cpu_power[i].Number, + cpu_power[i].MaxMhz, cpu_power[i].CurrentMhz, cpu_power[i].MhzLimit, + cpu_power[i].MaxIdleState, cpu_power[i].CurrentIdleState); + } return STATUS_SUCCESS; } default:

1 0

Rico Schüller : d3dx9: Move transpose matrix into get_matrix().
by Alexandre Julliard Sept. 14, 2012

Sept. 14, 2012

Module: wine Branch: master Commit: 8fb16c955bfdc0319ff6f0adfda44757c6bcc618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb16c955bfdc0319ff6f0adf… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 14 10:56:25 2012 +0200 d3dx9: Move transpose matrix into get_matrix(). --- dlls/d3dx9_36/effect.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0a70128..6558a48 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -870,7 +870,7 @@ static void set_vector(struct d3dx_parameter *param, CONST D3DXVECTOR4 *vector) } } -static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) +static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL transpose) { UINT i, k; @@ -878,10 +878,12 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) { for (k = 0; k < 4; ++k) { + FLOAT *tmp = transpose ? (FLOAT *)&matrix->u.m[k][i] : (FLOAT *)&matrix->u.m[i][k]; + if ((i < param->rows) && (k < param->columns)) - set_number((FLOAT *)&matrix->u.m[i][k], D3DXPT_FLOAT, (DWORD *)param->data + i * param->columns + k, param->type); + set_number(tmp, D3DXPT_FLOAT, (DWORD *)param->data + i * param->columns + k, param->type); else - matrix->u.m[i][k] = 0.0f; + *tmp = 0.0f; } } } @@ -2213,7 +2215,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DX switch (param->class) { case D3DXPC_MATRIX_ROWS: - get_matrix(param, matrix); + get_matrix(param, matrix, FALSE); return D3D_OK; case D3DXPC_SCALAR: @@ -2292,7 +2294,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i]); + get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i], FALSE); } return D3D_OK; @@ -2369,7 +2371,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixPointerArray(ID3DXBaseEffect case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - get_matrix(get_parameter_struct(param->member_handles[i]), matrix[i]); + get_matrix(get_parameter_struct(param->member_handles[i]), matrix[i], FALSE); } return D3D_OK; @@ -2427,7 +2429,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *if { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - D3DXMATRIX m; TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); @@ -2439,12 +2440,11 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *if { case D3DXPC_SCALAR: case D3DXPC_VECTOR: - get_matrix(param, matrix); + get_matrix(param, matrix, FALSE); return D3D_OK; case D3DXPC_MATRIX_ROWS: - get_matrix(param, &m); - D3DXMatrixTranspose(matrix, &m); + get_matrix(param, matrix, TRUE); return D3D_OK; case D3DXPC_OBJECT: @@ -2521,10 +2521,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposeArray(ID3DXBaseEffec case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - D3DXMATRIX m; - - get_matrix(get_parameter_struct(param->member_handles[i]), &m); - D3DXMatrixTranspose(&matrix[i], &m); + get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i], TRUE); } return D3D_OK; @@ -2593,7 +2590,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposePointerArray(ID3DXBa if (matrix && param && count <= param->element_count) { UINT i; - D3DXMATRIX m; TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); @@ -2602,8 +2598,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposePointerArray(ID3DXBa case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - get_matrix(get_parameter_struct(param->member_handles[i]), &m); - D3DXMatrixTranspose(matrix[i], &m); + get_matrix(get_parameter_struct(param->member_handles[i]), matrix[i], TRUE); } return D3D_OK;

1 0