wine-devel January 2019

wine-devel@winehq.org

68 participants
552 discussions

[PATCH 1/5] wined3d: Introduce a separate structure for stateblock state and store vertex shader state therein.
by Zebediah Figura 28 Jan '19

28 Jan '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 25 +++++++++++++++++---- dlls/wined3d/stateblock.c | 40 ++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 10 +++++++++ 3 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a7e274dd5a..b7071dbcc1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -486,6 +486,8 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) { UINT i; + wined3d_stateblock_state_cleanup(&device->stateblock_state); + wined3d_cs_destroy(device->cs); if (device->recording && wined3d_stateblock_decref(device->recording)) @@ -2208,21 +2210,29 @@ struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration( void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_VERTEX]; + struct wined3d_shader *prev = device->state.shader[WINED3D_SHADER_TYPE_VERTEX]; TRACE("device %p, shader %p.\n", device, shader); + if (shader) + wined3d_shader_incref(shader); + if (device->update_stateblock_state->vs) + wined3d_shader_decref(device->update_stateblock_state->vs); + device->update_stateblock_state->vs = shader; + if (device->recording) + { device->recording->changed.vertexShader = TRUE; + return; + } if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_VERTEX] = shader; - if (!device->recording) - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_VERTEX, shader); + device->state.shader[WINED3D_SHADER_TYPE_VERTEX] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_VERTEX, shader); if (prev) wined3d_shader_decref(prev); } @@ -3552,6 +3562,7 @@ HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device) device->recording = stateblock; device->update_state = &stateblock->state; + device->update_stateblock_state = &stateblock->stateblock_state; TRACE("Recording stateblock %p.\n", stateblock); @@ -3577,6 +3588,7 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device, *stateblock = object; device->recording = NULL; device->update_state = &device->state; + device->update_stateblock_state = &device->stateblock_state; TRACE("Returning stateblock %p.\n", *stateblock); @@ -4998,6 +5010,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); + wined3d_stateblock_state_cleanup(&device->stateblock_state); if (device->d3d_initialized) wined3d_device_delete_opengl_contexts(device); @@ -5005,6 +5018,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; + memset(&device->stateblock_state, 0, sizeof(device->stateblock_state)); + device->update_stateblock_state = &device->stateblock_state; device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) @@ -5279,6 +5294,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; + device->update_stateblock_state = &device->stateblock_state; device->max_frame_latency = 3; @@ -5286,6 +5302,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, { WARN("Failed to create command stream.\n"); state_cleanup(&device->state); + wined3d_stateblock_state_cleanup(&device->stateblock_state); hr = E_FAIL; goto err; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9539ae0696..4ead27b1d6 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -521,6 +521,17 @@ void state_unbind_resources(struct wined3d_state *state) } } +void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) +{ + struct wined3d_shader *shader; + + if ((shader = state->vs)) + { + state->vs = NULL; + wined3d_shader_decref(shader); + } +} + void state_cleanup(struct wined3d_state *state) { unsigned int counter; @@ -554,6 +565,7 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { state_cleanup(&stateblock->state); + wined3d_stateblock_state_cleanup(&stateblock->stateblock_state); heap_free(stateblock); } @@ -669,6 +681,7 @@ static void wined3d_state_record_lights(struct wined3d_state *dst_state, const s void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { + const struct wined3d_stateblock_state *state = &stateblock->device->stateblock_state; const struct wined3d_state *src_state = &stateblock->device->state; unsigned int i; DWORD map; @@ -677,18 +690,15 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) TRACE("Capturing state %p.\n", src_state); - if (stateblock->changed.vertexShader && stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX] - != src_state->shader[WINED3D_SHADER_TYPE_VERTEX]) + if (stateblock->changed.vertexShader && stateblock->stateblock_state.vs != state->vs) { - TRACE("Updating vertex shader from %p to %p\n", - stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX], - src_state->shader[WINED3D_SHADER_TYPE_VERTEX]); + TRACE("Updating vertex shader from %p to %p.\n", stateblock->stateblock_state.vs, state->vs); - if (src_state->shader[WINED3D_SHADER_TYPE_VERTEX]) - wined3d_shader_incref(src_state->shader[WINED3D_SHADER_TYPE_VERTEX]); - if (stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]) - wined3d_shader_decref(stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]); - stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX] = src_state->shader[WINED3D_SHADER_TYPE_VERTEX]; + if (state->vs) + wined3d_shader_incref(state->vs); + if (stateblock->stateblock_state.vs) + wined3d_shader_decref(stateblock->stateblock_state.vs); + stateblock->stateblock_state.vs = state->vs; } /* Vertex shader float constants. */ @@ -978,6 +988,7 @@ static void apply_lights(struct wined3d_device *device, const struct wined3d_sta void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) { + struct wined3d_stateblock_state *state = &stateblock->device->stateblock_state; struct wined3d_device *device = stateblock->device; unsigned int i; DWORD map; @@ -985,7 +996,14 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applying stateblock %p to device %p.\n", stateblock, device); if (stateblock->changed.vertexShader) - wined3d_device_set_vertex_shader(device, stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]); + { + if (stateblock->stateblock_state.vs) + wined3d_shader_incref(stateblock->stateblock_state.vs); + if (state->vs) + wined3d_shader_decref(state->vs); + state->vs = stateblock->stateblock_state.vs; + wined3d_device_set_vertex_shader(device, stateblock->stateblock_state.vs); + } /* Vertex Shader Constants. */ for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7b265f3662..e45ee7be33 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2968,6 +2968,11 @@ struct wined3d_dummy_textures * wined3d_device_create() ignores it. */ #define WINED3DCREATE_MULTITHREADED 0x00000004 +struct wined3d_stateblock_state +{ + struct wined3d_shader *vs; +}; + struct wined3d_device { LONG ref; @@ -3006,6 +3011,8 @@ struct wined3d_device struct wined3d_state state; struct wined3d_state *update_state; struct wined3d_stateblock *recording; + struct wined3d_stateblock_state stateblock_state; + struct wined3d_stateblock_state *update_stateblock_state; /* Internal use fields */ struct wined3d_device_creation_parameters create_parms; @@ -3556,6 +3563,7 @@ struct wined3d_stateblock /* Array indicating whether things have been set or changed */ struct wined3d_saved_states changed; struct wined3d_state state; + struct wined3d_stateblock_state stateblock_state; /* Contained state management */ DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; @@ -3582,6 +3590,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; +void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; + void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; void wined3d_state_enable_light(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, struct wined3d_light_info *light_info, BOOL enable) DECLSPEC_HIDDEN; -- 2.17.1

2 9

[PATCH] d3drm/tests: Add missing HRESULT.
by Andrey Gusev 28 Jan '19

28 Jan '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3drm/tests/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5157952d63..2fb2699f36 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3268,7 +3268,7 @@ static void test_device_qi(void) ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3); ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr); - IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3 (hr = %x)\n", hr); IDirect3DRMDevice3_Release(device3); test_qi("device3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); -- 2.20.1

2 1

[PATCH] include: Fix a typo in D2D1_WINDOW_STATE values.
by Nikolay Sivov 28 Jan '19

28 Jan '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- I think 0/1 makes more sense in this context than fixing missing leading zeroes. include/d2d1.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index c9fb8f0b6b..08487fa6b0 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -274,8 +274,8 @@ typedef enum D2D1_FEATURE_LEVEL typedef enum D2D1_WINDOW_STATE { - D2D1_WINDOW_STATE_NONE = 0x0000000, - D2D1_WINDOW_STATE_OCCLUDED = 0x0000001, + D2D1_WINDOW_STATE_NONE = 0, + D2D1_WINDOW_STATE_OCCLUDED = 1, D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff, } D2D1_WINDOW_STATE; -- 2.20.1

2 1

[PATCH 01/10] d3dx9/tests: Add more tests for D3DXMatrixTransformation().
by Matteo Bruni 28 Jan '19

28 Jan '19

From: David Adam <david.adam.cnrs(a)gmail.com> Most of those new tests were written by Rico Schüller <kgbricola(a)web.de> for bug 33456. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/math.c | 705 +++++++++++++++++++++++++++++++++++++ 1 file changed, 705 insertions(+) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index e433b1f50e5..2aeea26a54b 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -639,6 +639,486 @@ static void D3DXMatrixTest(void) expect_matrix(&expectedmat, &gotmat, 8); /*____________D3DXMatrixTransformation______________*/ + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, NULL, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, NULL, NULL, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, NULL, NULL, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, NULL, &eye, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -3.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 7.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, NULL, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, NULL, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, NULL, NULL, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, NULL, &eye, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -3.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 7.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, &axis, NULL, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, NULL, NULL, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, NULL, NULL, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 8.5985f, -21.024f, 14.383499, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, NULL, &eye, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + -2.8512f, 2.6508f, -2.7732f, 0.0f, + 7.148399f, 1.3552f, -9.5116f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, &axis, NULL, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, NULL, NULL, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, NULL, NULL, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -3.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 7.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, &axis, &eye, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, NULL, &eye, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, NULL, &eye, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 25521.0f, 39984.0f, 20148.0f, 0.0f, + 39984.0f, 4933.0f, -3324.0f, 0.0f, + 20148.0f, -3324.0f, -5153.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -3.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 7.0f, 0.0f, + 0.0f, 52.0f, 54.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, NULL, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 18.2985f, -29.624001f, 15.683499f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, NULL, &eye, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + -2.8512f, 2.6508f, -2.7732f, 0.0f, + 7.148399f, 1.3552f, -9.5116f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, &axis, NULL, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, NULL, NULL, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, NULL, NULL, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -3.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 7.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, &axis, &eye, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, NULL, &eye, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, NULL, &eye, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 25521.0f, 39984.0f, 20148.0f, 0.0f, + 39984.0f, 4933.0f, -3324.0f, 0.0f, + 20148.0f, -3324.0f, -5153.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -3.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 7.0f, 0.0f, + 9.7f, 43.400002f, 55.299999f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, &axis, NULL, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, NULL, NULL, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + -2.8512f, 2.6508f, -2.7732f, 0.0f, + 7.148399f, 1.3552f, -9.5116f, 0.0f, + 8.5985f, -21.024f, 14.383499, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, &axis, &eye, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 8.5985f, -21.024f, 14.383499, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, NULL, &eye, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 8.5985f, -21.024f, 14.383499, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, NULL, &eye, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + 53094.015625f, 2044.133789f, 21711.687500f, 0.0f, + -7294.705078f, 47440.683594f, 28077.113281, 0.0f, + -12749.161133f, 28365.580078f, 13503.520508f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 4); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + -2.8512f, 2.6508f, -2.7732f, 0.0f, + 7.148399f, 1.3552f, -9.5116f, 0.0f, + 104.565598f, -35.492798f, -25.306400f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, &axis, NULL, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, NULL, NULL, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + 25521.0f, 39984.0f, 20148.0f, 0.0f, + 39984.0f, 4933.0f, -3324.0f, 0.0f, + 20148.0f, -3324.0f, -5153.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, &eye, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -3.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 7.0f, 0.0f, + 0.0f, 52.0f, 54.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, &axis, &eye, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, NULL, &eye, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 25521.0f, 39984.0f, 20148.0f, 0.0f, + 39984.0f, 4933.0f, -3324.0f, 0.0f, + 20148.0f, -3324.0f, -5153.0f, 0.0f, + -287420.0f, -14064.0f, 37122.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + -2.8512f, 2.6508f, -2.7732f, 0.0f, + 7.148399f, 1.3552f, -9.5116f, 0.0f, + 18.2985f, -29.624001f, 15.683499f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, NULL, &axis, &eye, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 18.2985f, -29.624001f, 15.683499f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, NULL, &eye, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 18.2985f, -29.624001f, 15.683499f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, NULL, &eye, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + 53094.015625f, 2044.133789f, 21711.687500f, 0.0f, + -7294.705078f, 47440.683594f, 28077.113281, 0.0f, + -12749.161133f, 28365.580078f, 13503.520508f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, &r, &last); + expect_matrix(&expectedmat, &gotmat, 4); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + -2.8512f, 2.6508f, -2.7732f, 0.0f, + 7.148399f, 1.3552f, -9.5116f, 0.0f, + 114.265594f, -44.092796f, -24.006401f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, &axis, NULL, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, NULL, NULL, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + 25521.0f, 39984.0f, 20148.0f, 0.0f, + 39984.0f, 4933.0f, -3324.0f, 0.0f, + 20148.0f, -3324.0f, -5153.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, &eye, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -3.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 7.0f, 0.0f, + 9.7f, 43.400002f, 55.299999f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, &axis, &eye, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 9.7f, -8.6f, 1.3f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, NULL, &eye, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 25521.0f, 39984.0f, 20148.0f, 0.0f, + 39984.0f, 4933.0f, -3324.0f, 0.0f, + 20148.0f, -3324.0f, -5153.0f, 0.0f, + -287410.3125f, -14072.599609f, 37123.300781f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, &axis, NULL, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 53094.015625f, 2044.133789f, 21711.687500f, 0.0f, + -7294.705078f, 47440.683594f, 28077.113281, 0.0f, + -12749.161133f, 28365.580078f, 13503.520508f, 0.0f, + 8.598499f, -21.024f, 14.383499f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, &eye, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 4); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + -2.8512f, 2.6508f, -2.7732f, 0.0f, + 7.148399f, 1.3552f, -9.5116f, 0.0f, + 113.164093f, -56.5168f, -10.922897f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, &axis, &eye, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + 0.9504f, -0.8836f, 0.9244f, 0.0f, + 1.0212f, 0.1936f, -1.3588f, 0.0f, + 8.5985f, -21.024f, 14.383499, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, NULL, &eye, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + 53094.015625f, 2044.133789f, 21711.687500f, 0.0f, + -7294.705078f, 47440.683594f, 28077.113281, 0.0f, + -12749.161133f, 28365.580078f, 13503.520508f, 0.0f, + 86280.34375f, -357366.3125f, -200024.125f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, &axis, NULL, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 4); + + set_matrix(&expectedmat, + 25521.0f, 39984.0f, 20148.0f, 0.0f, + 39984.0f, 4933.0f, -3324.0f, 0.0f, + 20148.0f, -3324.0f, -5153.0f, 0.0f, + -287410.3125f, -14064.0f, 37122.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, &axis, &eye, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 512); + + set_matrix(&expectedmat, + 53094.015625f, 2044.133789f, 21711.687500f, 0.0f, + -7294.705078f, 47440.683594f, 28077.113281, 0.0f, + -12749.161133f, 28365.580078f, 13503.520508f, 0.0f, + 86280.34375f, -357366.3125f, -200009.75f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, &axis, &eye, &r, NULL); + expect_matrix(&expectedmat, &gotmat, 2048); + + set_matrix(&expectedmat, + 25521.0f, 39984.0f, 20148.0f, 0.0f, + 39984.0f, 4933.0f, -3324.0f, 0.0f, + 20148.0f, -3324.0f, -5153.0f, 0.0f, + -287410.3125f, -14072.599609f, 37123.300781f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, &axis, &eye, NULL, &last); + expect_matrix(&expectedmat, &gotmat, 0); + + set_matrix(&expectedmat, + 53094.015625f, 2044.133789f, 21711.687500f, 0.0f, + -7294.705078f, 47440.683594f, 28077.113281, 0.0f, + -12749.161133f, 28365.580078f, 13503.520508f, 0.0f, + 86290.046875f, -357374.90625f, -200022.828125f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, &axis, NULL, &r, &last); + expect_matrix(&expectedmat, &gotmat, 4); + set_matrix(&expectedmat, -0.21480007f, 1.3116000f, 0.47520003f, 0.0f, 0.95040143f, -0.88360137f, 0.92439979f, 0.0f, @@ -647,6 +1127,231 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, &at, &q, NULL, &eye, &r, &last); expect_matrix(&expectedmat, &gotmat, 512); + set_matrix(&expectedmat, + -0.2148f, 1.3116f, 0.4752f, 0.0f, + -2.8512f, 2.6508f, -2.7732f, 0.0f, + 7.148399f, 1.3552f, -9.5116f, 0.0f, + 122.86409f, -65.116798f, -9.622897f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, NULL, &axis, &eye, &r, &last); + expect_matrix(&expectedmat, &gotmat, 8); + + set_matrix(&expectedmat, + 53094.015625f, 2044.133789f, 21711.687500f, 0.0f, + -7294.705078f, 47440.683594f, 28077.113281, 0.0f, + -12749.161133f, 28365.580078f, 13503.520508f, 0.0f, + 18.2985f, -29.624001f, 15.683499f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, &eye, &r, &last); + expect_matrix(&expectedmat, &gotmat, 4); + + q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 1.0f, + axis.x = 1.0f, axis.y = 1.0f, axis.z = 2.0f, + + set_matrix(&expectedmat, + 41.0f, -12.0f, -24.0f, 0.0f, + -12.0f, 25.0f, -12.0f, 0.0f, + -24.0f, -12.0f, 34.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 1.0f, + axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + + set_matrix(&expectedmat, + 57.0f, -12.0f, -36.0f, 0.0f, + -12.0f, 25.0f, -12.0f, 0.0f, + -36.0f, -12.0f, 43.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 0.0f, + axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + + set_matrix(&expectedmat, + 25.0f, 0.0f, -20.0f, 0.0f, + 0.0f, 25.0f, -20.0f, 0.0f, + -20.0f, -20.0f, 35.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 1.0f, q.y = 1.0f, q.z = 0.0f, q.w = 0.0f, + axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + + set_matrix(&expectedmat, + 5.0f, -4.0f, 0.0f, 0.0f, + -4.0f, 5.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 27.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, + axis.x = 5.0f, axis.y = 2.0f, axis.z = 1.0f, + + set_matrix(&expectedmat, + 5.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, + axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 4.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 0.0f, q.y = 1.0f, q.z = 0.0f, q.w = 0.0f, + axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 4.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 1.0f, + axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 8.0f, -6.0f, 0.0f, + 0.0f, -6.0f, 17.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 1.0f, + axis.x = 0.0f, axis.y = 4.0f, axis.z = 0.0f, + + set_matrix(&expectedmat, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 4.0f, -8.0f, 0.0f, + 0.0f, -8.0f, 16.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 0.0f, q.y = 1.0f, q.z = 0.0f, q.w = 1.0f, + axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + + set_matrix(&expectedmat, + 5.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 4.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 5.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, + axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 3.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, + axis.x = 3.0f, axis.y = 3.0f, axis.z = 3.0f, + + set_matrix(&expectedmat, + 3796587.0f, -1377948.0f, -1589940.0f, 0.0f, + -1377948.0f, 3334059.0f, -1879020.0f, 0.0f, + -1589940.0f, -1879020.0f, 2794443.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, + axis.x = 1.0f, axis.y = 1.0f, axis.z = 1.0f, + + set_matrix(&expectedmat, + 1265529.0f, -459316.0f, -529980.0f, 0.0f, + -459316.0f, 1111353.0f, -626340.0f, 0.0f, + -529980.0f, -626340.0f, 931481.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, + axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + + set_matrix(&expectedmat, + 2457497.0f, -434612.0f, -1423956.0f, 0.0f, + -434612.0f, 1111865.0f, -644868.0f, 0.0f, + -1423956.0f, -644868.0f, 1601963.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, + axis.x = 0.0f, axis.y = 0.0f, axis.z = 3.0f, + + set_matrix(&expectedmat, + 1787952.0f, 37056.0f, -1340964.0f, 0.0f, + 37056.0f, 768.0f, -27792.0f, 0.0f, + -1340964.0f, -27792.0f, 1005723.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, + axis.x = 0.0f, axis.y = 0.0f, axis.z = 1.0f, + + set_matrix(&expectedmat, + 595984.0f, 12352.0f, -446988.0f, 0.0f, + 12352.0f, 256.0f, -9264.0f, 0.0f, + -446988.0f, -9264.0f, 335241.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, + axis.x = 0.0f, axis.y = 3.0f, axis.z = 0.0f, + + set_matrix(&expectedmat, + 150528.0f, 464352.0f, -513408.0f, 0.0f, + 464352.0f, 1432443.0f, -1583772.0f, 0.0f, + -513408.0f, -1583772.0f, 1751088.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, + axis.x = 0.0f, axis.y = 1.0f, axis.z = 0.0f, + + set_matrix(&expectedmat, + 50176.0f, 154784.0f, -171136.0f, 0.0f, + 154784.0f, 477481.0f, -527924.0f, 0.0f, + -171136.0f, -527924.0f, 583696.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + + q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, + axis.x = 1.0f, axis.y = 0.0f, axis.z = 0.0f, + + set_matrix(&expectedmat, + 619369.0f, -626452.0f, 88144.0f, 0.0f, + -626452.0f, 633616.0f, -89152.0f, 0.0f, + 88144.0f, -89152, 12544.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); + expect_matrix(&expectedmat, &gotmat, 0); + /*____________D3DXMatrixTranslation______________*/ set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, -- 2.19.2

4 27

[PATCH 1/6] user32/focus: Prevent a recursive activation loop with the activation messages
by Gabriel Ivăncescu 28 Jan '19

28 Jan '19

When activating a window and sending activation messages to the window procedure (i.e. WM_NCACTIVATE and WM_ACTIVATE), we have to avoid a recursive loop by not sending more of these messages or hooks while we are still activating the window. Some applications actually depend on this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- It may seem a bit strange (and I thought so as well initially), but this is exactly what's needed to match the testcase in the next patch, so this is how Windows does it (yes, including the hooks). dlls/user32/focus.c | 44 +++++++++++++++++++++++++++++--------------- dlls/user32/win.h | 1 + 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index f1c8831..0d32d00 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -78,7 +78,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) { HWND previous = GetActiveWindow(); BOOL ret; - DWORD old_thread, new_thread; + DWORD winflags, old_thread, new_thread; CBTACTIVATESTRUCT cbt; if (previous == hwnd) @@ -87,16 +87,24 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) return TRUE; } - /* call CBT hook chain */ - cbt.fMouse = mouse; - cbt.hWndActive = previous; - if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) return FALSE; - - if (IsWindow(previous)) + /* Prevent a recursive activation loop with the activation messages */ + winflags = win_set_flags(hwnd, WIN_IS_IN_ACTIVATION, 0); + if (!(winflags & WIN_IS_IN_ACTIVATION)) { - SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); - SendMessageW( previous, WM_ACTIVATE, - MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + ret = FALSE; + + /* call CBT hook chain */ + cbt.fMouse = mouse; + cbt.hWndActive = previous; + if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) + goto clear_flags; + + if (IsWindow(previous)) + { + SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); + SendMessageW( previous, WM_ACTIVATE, + MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + } } SERVER_START_REQ( set_active_window ) @@ -106,9 +114,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) previous = wine_server_ptr_handle( reply->previous ); } SERVER_END_REQ; - if (!ret) return FALSE; + if (!ret) goto clear_flags; if (prev) *prev = previous; - if (previous == hwnd) return TRUE; + if (previous == hwnd) goto clear_flags; if (hwnd) { @@ -116,7 +124,11 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (SendMessageW( hwnd, WM_QUERYNEWPALETTE, 0, 0 )) SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0, SMTO_ABORTIFHUNG, 2000, NULL ); - if (!IsWindow(hwnd)) return FALSE; + if (!IsWindow(hwnd)) + { + ret = FALSE; + goto clear_flags; + } } old_thread = previous ? GetWindowThreadProcessId( previous, NULL ) : 0; @@ -148,7 +160,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - if (IsWindow(hwnd)) + if (!(winflags & WIN_IS_IN_ACTIVATION) && IsWindow(hwnd)) { SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); SendMessageW( hwnd, WM_ACTIVATE, @@ -173,7 +185,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - return TRUE; +clear_flags: + win_set_flags(hwnd, 0, WIN_IS_IN_ACTIVATION); + return ret; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index f3bdfd3..fa5d1b6 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -80,6 +80,7 @@ typedef struct tagWND #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ #define WIN_HAS_IME_WIN 0x0080 /* the window has been registered with imm32 */ +#define WIN_IS_IN_ACTIVATION 0x0100 /* the window is in an activation process */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; -- 2.19.1

2 7

[PATCH 1/2] kernel32/tests: Add CopyFile[Ex]A NULL handling tests.
by Gijs Vermeulen 28 Jan '19

28 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/kernel32/tests/file.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index d1b76bb711..b47b2b9c41 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -738,6 +738,14 @@ static void test_CopyFileA(void) ret = CopyFileA(source, dest, FALSE); ok(ret, "CopyFileA: error %d\n", GetLastError()); + /* NULL checks */ + retok = CopyFileA(NULL, dest, TRUE); + ok(!retok && GetLastError() == ERROR_PATH_NOT_FOUND, + "CopyFileA: ret = %d, unexpected error %d\n", retok, GetLastError()); + retok = CopyFileA(source, NULL, TRUE); + ok(!retok && GetLastError() == ERROR_PATH_NOT_FOUND, + "CopyFileA: ret = %d, unexpected error %d\n", retok, GetLastError()); + /* copying from a read-locked source fails */ hfile = CreateFileA(source, GENERIC_READ, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); @@ -1174,6 +1182,13 @@ static void test_CopyFileEx(void) todo_wine ok(GetFileAttributesA(dest) == INVALID_FILE_ATTRIBUTES, "file was not deleted\n"); + retok = CopyFileExA(source, NULL, copy_progress_cb, hfile, NULL, 0); + ok(!retok, "CopyFileExA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, "expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + retok = CopyFileExA(NULL, dest, copy_progress_cb, hfile, NULL, 0); + ok(!retok, "CopyFileExA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, "expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + ret = DeleteFileA(source); ok(ret, "DeleteFileA failed with error %d\n", GetLastError()); ret = DeleteFileA(dest); -- 2.20.1

2 2

[PATCH 3/3 v2] ucrtbase/tests: Add tests for C locale.
by Piotr Caban 28 Jan '19

28 Jan '19

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)

1 0

[PATCH 2/3 v2] msvcrt: _towupper_l only uppercase a-z in C locale.
by Piotr Caban 28 Jan '19

28 Jan '19

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 2 -- dlls/msvcrt/wcs.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3 v2] msvcrt: _towlower_l only lowercase A-Z in C locale.
by Piotr Caban 28 Jan '19

28 Jan '19

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - changed commit message in patch 1 and 2 - removed unused variable in patch 3 dlls/msvcrt/tests/string.c | 2 -- dlls/msvcrt/wcs.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[PATCH] shell32: Remove duplicated assignment (Coverity).
by Nikolay Sivov 28 Jan '19

28 Jan '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/brsfolder.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d771d0b5fb..37363a1cec 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -647,7 +647,6 @@ static LRESULT BrsFolder_Treeview_Keydown(browse_info *info, LPNMTVKEYDOWN keydo TV_ITEMDATA *item_data; item.mask = TVIF_PARAM; - item.mask = TVIF_HANDLE|TVIF_PARAM; item.hItem = selected_item; SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); item_data = (TV_ITEMDATA *)item.lParam; -- 2.20.1

2 2

← Newer
1
...
13
14
15
16
17
18
19
...
56
Older →

Jump to page:

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-devel January 2019