September 2012 - Wine-commits

Henri Verbeet : wined3d: Just return the texture from wined3d_device_get_texture().
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: f9d494294a05f71a0dab33c7bc8a5b2bad7499a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d494294a05f71a0dab33c7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 22:34:02 2012 +0200 wined3d: Just return the texture from wined3d_device_get_texture(). --- dlls/d3d8/device.c | 13 +------------ dlls/d3d9/device.c | 9 ++------- dlls/ddraw/device.c | 35 ++++++++--------------------------- dlls/wined3d/device.c | 15 ++++----------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 +-- 6 files changed, 17 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9d494294a05f71a0dab3…

1 0

Henri Verbeet : wined3d: wined3d_device_set_software_vertex_processing() never fails.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: c0f52fbf1c044514a0a0b403dc5062c2615ff726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f52fbf1c044514a0a0b403d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 22:34:03 2012 +0200 wined3d: wined3d_device_set_software_vertex_processing() never fails. --- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 4 +--- include/wine/wined3d.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b8f23d7..cd7e001 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1884,15 +1884,14 @@ static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT static HRESULT WINAPI d3d9_device_SetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface, BOOL software) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, software %#x.\n", iface, software); wined3d_mutex_lock(); - hr = wined3d_device_set_software_vertex_processing(device->wined3d_device, software); + wined3d_device_set_software_vertex_processing(device->wined3d_device, software); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static BOOL WINAPI d3d9_device_GetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bf78c28..916a648 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4205,7 +4205,7 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software) +void CDECL wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software) { static BOOL warned; @@ -4218,8 +4218,6 @@ HRESULT CDECL wined3d_device_set_software_vertex_processing(struct wined3d_devic } device->softwareVertexProcessing = software; - - return WINED3D_OK; } BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_device *device) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bb16455..40dfda8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2224,7 +2224,7 @@ HRESULT __cdecl wined3d_device_set_render_target(struct wined3d_device *device, void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); -HRESULT __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); +void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride); HRESULT __cdecl wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider);

1 0

Henri Verbeet : wined3d: Introduce a separate function to retrieve the GLSL variable prefix.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 49f9d394934109e13fe76a9605aed505efc3d089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f9d394934109e13fe76a960… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 22:34:04 2012 +0200 wined3d: Introduce a separate function to retrieve the GLSL variable prefix. --- dlls/wined3d/glsl_shader.c | 153 ++++++++++++++++++++++--------------------- 1 files changed, 78 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49f9d394934109e13fe76…

1 0

Jacek Caban : include: Added uiautomationcoreapi.h.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: ff17a4ea862b41ec3ae023f19816059027c422fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff17a4ea862b41ec3ae023f19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 27 12:20:41 2012 +0200 include: Added uiautomationcoreapi.h. --- include/Makefile.in | 1 + include/uiautomation.h | 2 +- include/uiautomationcoreapi.h | 49 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 0514c4f..b32e4b9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -521,6 +521,7 @@ SRCDIR_INCLUDES = \ twain.h \ udpmib.h \ uiautomation.h \ + uiautomationcoreapi.h \ userenv.h \ usp10.h \ uuids.h \ diff --git a/include/uiautomation.h b/include/uiautomation.h index fb4a949..b58c4e6 100644 --- a/include/uiautomation.h +++ b/include/uiautomation.h @@ -18,4 +18,4 @@ #include <uiautomationcore.h> #include <uiautomationclient.h> -/* #include <uiautomationcoreapi.h> */ +#include <uiautomationcoreapi.h> diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h new file mode 100644 index 0000000..340f500 --- /dev/null +++ b/include/uiautomationcoreapi.h @@ -0,0 +1,49 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_UIAUTOMATIONCOREAPI +#define _INC_UIAUTOMATIONCOREAPI + +#ifdef __cplusplus +extern "C" { +#endif + +#define UIA_E_ELEMENTNOTENABLED 0x80040200 +#define UIA_E_ELEMENTNOTAVAILABLE 0x80040201 +#define UIA_E_NOCLICKABLEPOINT 0x80040202 +#define UIA_E_PROXYASSEMBLYNOTLOADED 0x80040203 +#define UIA_E_NOTSUPPORTED 0x80040204 +#define UIA_E_INVALIDOPERATION 0x80131509 +#define UIA_E_TIMEOUT 0x80131505 + +#define UiaAppendRuntimeId 3 +#define UiaRootObjectId -25 + +DECLARE_HANDLE(HUIANODE); +DECLARE_HANDLE(HUIAPATTERNOBJECT); +DECLARE_HANDLE(HUIATEXTRANGE); +DECLARE_HANDLE(HUIAEVENT); + +BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); +BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); + +#ifdef __cplusplus +} +#endif + +#endif /* _INC_UIAUTOMATIONCOREAPI */

1 0

Ričardas Barkauskas : dxgi/tests: Test IDXGISwapChain_CreateSwapchain and IDXGISwapChain_GetDesc a bit.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: a2534f9b6d0dd077c3b48dbc5adc3ed859ee4721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2534f9b6d0dd077c3b48dbc5… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Wed Sep 26 20:46:37 2012 +0300 dxgi/tests: Test IDXGISwapChain_CreateSwapchain and IDXGISwapChain_GetDesc a bit. --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/device.c | 135 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index e66a03d..08d2db1 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxgi.dll -IMPORTS = dxgi +IMPORTS = dxgi user32 C_SRCS = \ device.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index fa97fdd..d492a95 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -292,6 +292,140 @@ static void test_output(IDXGIDevice *device) IDXGIAdapter_Release(adapter); } +struct refresh_rates +{ + UINT numerator; + UINT denominator; + BOOL numerator_should_pass; + BOOL denominator_should_pass; +}; + +static void test_createswapchain(IDXGIDevice *device) +{ + IUnknown *obj; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + IDXGISwapChain *swapchain; + DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; + HRESULT hr; + WNDCLASS wc = {0}; + UINT i; + + const struct refresh_rates refresh_list[] = + { + {60, 60, FALSE, FALSE}, + {60, 0, TRUE, FALSE}, + {60, 1, TRUE, TRUE}, + { 0, 60, TRUE, FALSE}, + { 0, 0, TRUE, FALSE}, + }; + + + wc.lpfnWndProc = DefWindowProc; + wc.lpszClassName = "dxgi_test_wc"; + + RegisterClass(&wc); + + creation_desc.OutputWindow = 0; + creation_desc.BufferDesc.Width = 800; + creation_desc.BufferDesc.Height = 600; + creation_desc.BufferDesc.RefreshRate.Numerator = 60; + creation_desc.BufferDesc.RefreshRate.Denominator = 60; + creation_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + creation_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + creation_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + creation_desc.SampleDesc.Count = 1; + creation_desc.SampleDesc.Quality = 0; + creation_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + creation_desc.BufferCount = 1; + creation_desc.OutputWindow = CreateWindow("dxgi_test_wc", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + creation_desc.Windowed = TRUE; + creation_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + creation_desc.Flags = 0; + + hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj); + ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown\n"); + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + hr = IDXGISwapChain_GetDesc(swapchain, NULL); + ok(hr == E_INVALIDARG, "GetDesc unexpectedly returned %#x.\n", hr); + + IDXGISwapChain_Release(swapchain); + + for (i = 0; i < sizeof(refresh_list)/sizeof(refresh_list[0]); i++) + { + creation_desc.BufferDesc.RefreshRate.Numerator = refresh_list[i].numerator; + creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; + + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + + if (refresh_list[i].numerator_should_pass) + ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, + "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); + else + todo_wine ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, + "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); + + if (refresh_list[i].denominator_should_pass) + ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, + "Denominator %u is %u.\n", i ,result_desc.BufferDesc.RefreshRate.Denominator); + else + todo_wine ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, + "Denominator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Denominator); + + IDXGISwapChain_Release(swapchain); + } + + creation_desc.Windowed = FALSE; + + for (i = 0; i < sizeof(refresh_list)/sizeof(refresh_list[0]); i++) + { + creation_desc.BufferDesc.RefreshRate.Numerator = refresh_list[i].numerator; + creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; + + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + + if (refresh_list[i].numerator_should_pass) + ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, + "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); + else + todo_wine ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, + "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); + + if (refresh_list[i].denominator_should_pass) + ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, + "Denominator %u is %u.\n", i ,result_desc.BufferDesc.RefreshRate.Denominator); + else + todo_wine ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, + "Denominator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Denominator); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + + IDXGISwapChain_Release(swapchain); + } + + IDXGIFactory_Release(factory); + IDXGIAdapter_Release(adapter); + IUnknown_Release(obj); +} + START_TEST(device) { HMODULE d3d10core = LoadLibraryA("d3d10core.dll"); @@ -317,6 +451,7 @@ START_TEST(device) test_create_surface(device); test_parents(device); test_output(device); + test_createswapchain(device); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Ričardas Barkauskas : msvcp80: Use LoadLibraryA as msvcp90 might not yet or ever be loaded.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 2c05f0044c9718731be0b85bd4e2a4d8d5271f45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c05f0044c9718731be0b85bd… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Wed Sep 26 23:27:49 2012 +0300 msvcp80: Use LoadLibraryA as msvcp90 might not yet or ever be loaded. --- dlls/msvcp80/msvcp80.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp80/msvcp80.c b/dlls/msvcp80/msvcp80.c index a662848..018b204 100644 --- a/dlls/msvcp80/msvcp80.c +++ b/dlls/msvcp80/msvcp80.c @@ -104,7 +104,7 @@ static MSVCP_size_t (CDECL *pnumpunct_short__Getcat)(const struct locale_facet** static BOOL init_funcs(void) { - HMODULE hmod = GetModuleHandleA("msvcp90.dll"); + HMODULE hmod = LoadLibraryA("msvcp90.dll"); if(!hmod) return FALSE;

1 0

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionLn().
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: e921953374b1a4f4abeb1df5fac25a0a779149e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e921953374b1a4f4abeb1df5f… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Sep 27 12:14:18 2012 +0200 d3dx9: Use float functions in D3DXQuaternionLn(). --- dlls/d3dx9_36/math.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 9be3011..8cce57e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1305,23 +1305,23 @@ D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUA return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionLn(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) +D3DXQUATERNION * WINAPI D3DXQuaternionLn(D3DXQUATERNION *out, const D3DXQUATERNION *q) { FLOAT t; - TRACE("(%p, %p)\n", pout, pq); + TRACE("out %p, q %p\n", out, q); - if ( (pq->w >= 1.0f) || (pq->w == -1.0f) ) + if ((q->w >= 1.0f) || (q->w == -1.0f)) t = 1.0f; else - t = acos( pq->w ) / sqrt( 1.0f - pq->w * pq->w ); + t = acosf(q->w) / sqrtf(1.0f - q->w * q->w); - pout->x = t * pq->x; - pout->y = t * pq->y; - pout->z = t * pq->z; - pout->w = 0.0f; + out->x = t * q->x; + out->y = t * q->y; + out->z = t * q->z; + out->w = 0.0f; - return pout; + return out; } D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2)

1 0

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionRotationMatrix().
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 9a281e5dd2ee27ac55a7efcf0887be3197f25543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a281e5dd2ee27ac55a7efcf0… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Sep 27 12:14:23 2012 +0200 d3dx9: Use float functions in D3DXQuaternionRotationMatrix(). --- dlls/d3dx9_36/math.c | 91 ++++++++++++++++++++++++++------------------------ 1 files changed, 47 insertions(+), 44 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 8cce57e..dc0cfb7 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1370,57 +1370,60 @@ D3DXQUATERNION * WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *out, const D3 return out; } -D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST D3DXMATRIX *pm) +D3DXQUATERNION * WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *out, const D3DXMATRIX *m) { - int i, maxi; - FLOAT maxdiag, S, trace; + FLOAT s, trace; - TRACE("(%p, %p)\n", pout, pm); + TRACE("out %p, m %p\n", out, m); - trace = pm->u.m[0][0] + pm->u.m[1][1] + pm->u.m[2][2] + 1.0f; - if ( trace > 1.0f) - { - pout->x = ( pm->u.m[1][2] - pm->u.m[2][1] ) / ( 2.0f * sqrt(trace) ); - pout->y = ( pm->u.m[2][0] - pm->u.m[0][2] ) / ( 2.0f * sqrt(trace) ); - pout->z = ( pm->u.m[0][1] - pm->u.m[1][0] ) / ( 2.0f * sqrt(trace) ); - pout->w = sqrt(trace) / 2.0f; - return pout; - } - maxi = 0; - maxdiag = pm->u.m[0][0]; - for (i=1; i<3; i++) + trace = m->u.m[0][0] + m->u.m[1][1] + m->u.m[2][2] + 1.0f; + if (trace > 1.0f) { - if ( pm->u.m[i][i] > maxdiag ) - { - maxi = i; - maxdiag = pm->u.m[i][i]; - } + s = 2.0f * sqrtf(trace); + out->x = (m->u.m[1][2] - m->u.m[2][1]) / s; + out->y = (m->u.m[2][0] - m->u.m[0][2]) / s; + out->z = (m->u.m[0][1] - m->u.m[1][0]) / s; + out->w = 0.25f * s; } - switch( maxi ) + else { - case 0: - S = 2.0f * sqrt(1.0f + pm->u.m[0][0] - pm->u.m[1][1] - pm->u.m[2][2]); - pout->x = 0.25f * S; - pout->y = ( pm->u.m[0][1] + pm->u.m[1][0] ) / S; - pout->z = ( pm->u.m[0][2] + pm->u.m[2][0] ) / S; - pout->w = ( pm->u.m[1][2] - pm->u.m[2][1] ) / S; - break; - case 1: - S = 2.0f * sqrt(1.0f + pm->u.m[1][1] - pm->u.m[0][0] - pm->u.m[2][2]); - pout->x = ( pm->u.m[0][1] + pm->u.m[1][0] ) / S; - pout->y = 0.25f * S; - pout->z = ( pm->u.m[1][2] + pm->u.m[2][1] ) / S; - pout->w = ( pm->u.m[2][0] - pm->u.m[0][2] ) / S; - break; - case 2: - S = 2.0f * sqrt(1.0f + pm->u.m[2][2] - pm->u.m[0][0] - pm->u.m[1][1]); - pout->x = ( pm->u.m[0][2] + pm->u.m[2][0] ) / S; - pout->y = ( pm->u.m[1][2] + pm->u.m[2][1] ) / S; - pout->z = 0.25f * S; - pout->w = ( pm->u.m[0][1] - pm->u.m[1][0] ) / S; - break; + int i, maxi = 0; + + for (i = 1; i < 3; i++) + { + if (m->u.m[i][i] > m->u.m[maxi][maxi]) + maxi = i; + } + + switch (maxi) + { + case 0: + s = 2.0f * sqrtf(1.0f + m->u.m[0][0] - m->u.m[1][1] - m->u.m[2][2]); + out->x = 0.25f * s; + out->y = (m->u.m[0][1] + m->u.m[1][0]) / s; + out->z = (m->u.m[0][2] + m->u.m[2][0]) / s; + out->w = (m->u.m[1][2] - m->u.m[2][1]) / s; + break; + + case 1: + s = 2.0f * sqrtf(1.0f + m->u.m[1][1] - m->u.m[0][0] - m->u.m[2][2]); + out->x = (m->u.m[0][1] + m->u.m[1][0]) / s; + out->y = 0.25f * s; + out->z = (m->u.m[1][2] + m->u.m[2][1]) / s; + out->w = (m->u.m[2][0] - m->u.m[0][2]) / s; + break; + + case 2: + s = 2.0f * sqrtf(1.0f + m->u.m[2][2] - m->u.m[0][0] - m->u.m[1][1]); + out->x = (m->u.m[0][2] + m->u.m[2][0]) / s; + out->y = (m->u.m[1][2] + m->u.m[2][1]) / s; + out->z = 0.25f * s; + out->w = (m->u.m[0][1] - m->u.m[1][0]) / s; + break; + } } - return pout; + + return out; } D3DXQUATERNION * WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *out, FLOAT yaw, FLOAT pitch, FLOAT roll)

1 0

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionExp().
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: ef65fddaf9db55ad4b7edb825b9a2c691bbcb09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef65fddaf9db55ad4b7edb825… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Sep 27 12:14:49 2012 +0200 d3dx9: Use float functions in D3DXQuaternionExp(). --- dlls/d3dx9_36/math.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index dc0cfb7..d54095a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1263,28 +1263,29 @@ D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, CONST D3D return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) +D3DXQUATERNION * WINAPI D3DXQuaternionExp(D3DXQUATERNION *out, const D3DXQUATERNION *q) { FLOAT norm; - TRACE("(%p, %p)\n", pout, pq); + TRACE("out %p, q %p\n", out, q); - norm = sqrt(pq->x * pq->x + pq->y * pq->y + pq->z * pq->z); - if (norm ) + norm = sqrtf(q->x * q->x + q->y * q->y + q->z * q->z); + if (norm) { - pout->x = sin(norm) * pq->x / norm; - pout->y = sin(norm) * pq->y / norm; - pout->z = sin(norm) * pq->z / norm; - pout->w = cos(norm); + out->x = sinf(norm) * q->x / norm; + out->y = sinf(norm) * q->y / norm; + out->z = sinf(norm) * q->z / norm; + out->w = cosf(norm); } else { - pout->x = 0.0f; - pout->y = 0.0f; - pout->z = 0.0f; - pout->w = 1.0f; + out->x = 0.0f; + out->y = 0.0f; + out->z = 0.0f; + out->w = 1.0f; } - return pout; + + return out; } D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq)

1 0

Rico Schüller : include/d3dx9math.inl: Use float functions.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 7fa8b9cc32439d68368c19adf56dbfc05ef1509f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa8b9cc32439d68368c19adf… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Sep 27 12:14:53 2012 +0200 include/d3dx9math.inl: Use float functions. --- include/d3dx9math.inl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3dx9math.inl b/include/d3dx9math.inl index af6b456..5ee9a75 100644 --- a/include/d3dx9math.inl +++ b/include/d3dx9math.inl @@ -967,7 +967,7 @@ static inline FLOAT D3DXVec2Dot(CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) static inline FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv) { if (!pv) return 0.0f; - return sqrt( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); + return sqrtf( pv->x * pv->x + pv->y * pv->y ); } static inline FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv) @@ -1045,7 +1045,7 @@ static inline FLOAT D3DXVec3Dot(CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) static inline FLOAT D3DXVec3Length(CONST D3DXVECTOR3 *pv) { if (!pv) return 0.0f; - return sqrt( (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z) ); + return sqrtf( pv->x * pv->x + pv->y * pv->y + pv->z * pv->z ); } static inline FLOAT D3DXVec3LengthSq(CONST D3DXVECTOR3 *pv) @@ -1119,7 +1119,7 @@ static inline FLOAT D3DXVec4Dot(CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) static inline FLOAT D3DXVec4Length(CONST D3DXVECTOR4 *pv) { if (!pv) return 0.0f; - return sqrt( (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z) + (pv->w) * (pv->w) ); + return sqrtf( pv->x * pv->x + pv->y * pv->y + pv->z * pv->z + pv->w * pv->w ); } static inline FLOAT D3DXVec4LengthSq(CONST D3DXVECTOR4 *pv) @@ -1283,7 +1283,7 @@ static inline BOOL D3DXQuaternionIsIdentity(D3DXQUATERNION *pq) static inline FLOAT D3DXQuaternionLength(CONST D3DXQUATERNION *pq) { if (!pq) return 0.0f; - return sqrt( (pq->x) * (pq->x) + (pq->y) * (pq->y) + (pq->z) * (pq->z) + (pq->w) * (pq->w) ); + return sqrtf( pq->x * pq->x + pq->y * pq->y + pq->z * pq->z + pq->w * pq->w ); } static inline FLOAT D3DXQuaternionLengthSq(CONST D3DXQUATERNION *pq)

1 0