June 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : shlwapi: Import string functions from kernelbase.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 47c131ebcbf371e64b34e646191031b3d5572450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47c131ebcbf371e64b34e646… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:12:29 2019 +0200 shlwapi: Import string functions from kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 5 +- dlls/shell32/shell32.spec | 56 +- dlls/shlwapi/Makefile.in | 2 +- dlls/shlwapi/ordinal.c | 323 --------- dlls/shlwapi/string.c | 1677 +------------------------------------------ 5 files changed, 51 insertions(+), 2012 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47c131ebcbf371e64b34…

1 0

Alexandre Julliard : shlwapi: Import path functions from kernelbase.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: c9940d631b1c7a3393a536b238809b607f59a4e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9940d631b1c7a3393a536b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:12:37 2019 +0200 shlwapi: Import path functions from kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/path.c | 4084 +++++++++------------------------------------------ dlls/shlwapi/url.c | 47 - 2 files changed, 659 insertions(+), 3472 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9940d631b1c7a3393a5…

1 0

Alexandre Julliard : shlwapi: Import URL functions from kernelbase.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 7ac3acaa078308795d8c5b7c8975eea2089ba421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac3acaa078308795d8c5b7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:12:45 2019 +0200 shlwapi: Import URL functions from kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 2450 ---------------------------------------------------- 1 file changed, 2450 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ac3acaa078308795d8c…

1 0

Alexandre Julliard : shlwapi: Import registry functions from kernelbase.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 12db7213b8da1ec8cfb24f66feb35ce5d1dd59d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12db7213b8da1ec8cfb24f66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:12:51 2019 +0200 shlwapi: Import registry functions from kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 1041 ---------------------------------------------------- 1 file changed, 1041 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12db7213b8da1ec8cfb2…

1 0

Alexandre Julliard : shlwapi: Import QISearch() from kernelbase.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 605f503a8a0985764cb370ba284835bd357622e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=605f503a8a0985764cb370ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:12:57 2019 +0200 shlwapi: Import QISearch() from kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 51 -------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8efedd4..c24f485 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1900,57 +1900,6 @@ BOOL WINAPI FDSA_DeleteItem(FDSA_info *info, DWORD where) info->num_items--; return TRUE; } - -/************************************************************************* - * @ [SHLWAPI.219] - * - * Call IUnknown_QueryInterface() on a table of objects. - * - * RETURNS - * Success: S_OK. - * Failure: E_POINTER or E_NOINTERFACE. - */ -HRESULT WINAPI QISearch( - void *base, /* [in] Table of interfaces */ - const QITAB *table, /* [in] Array of REFIIDs and indexes into the table */ - REFIID riid, /* [in] REFIID to get interface for */ - void **ppv) /* [out] Destination for interface pointer */ -{ - HRESULT ret; - IUnknown *a_vtbl; - const QITAB *xmove; - - TRACE("(%p %p %s %p)\n", base, table, debugstr_guid(riid), ppv); - if (ppv) { - xmove = table; - while (xmove->piid) { - TRACE("trying (offset %d) %s\n", xmove->dwOffset, debugstr_guid(xmove->piid)); - if (IsEqualIID(riid, xmove->piid)) { - a_vtbl = (IUnknown*)(xmove->dwOffset + (LPBYTE)base); - TRACE("matched, returning (%p)\n", a_vtbl); - *ppv = a_vtbl; - IUnknown_AddRef(a_vtbl); - return S_OK; - } - xmove++; - } - - if (IsEqualIID(riid, &IID_IUnknown)) { - a_vtbl = (IUnknown*)(table->dwOffset + (LPBYTE)base); - TRACE("returning first for IUnknown (%p)\n", a_vtbl); - *ppv = a_vtbl; - IUnknown_AddRef(a_vtbl); - return S_OK; - } - *ppv = 0; - ret = E_NOINTERFACE; - } else - ret = E_POINTER; - - TRACE("-- 0x%08x\n", ret); - return ret; -} - /************************************************************************* * @ [SHLWAPI.220] *

1 0

Alexandre Julliard : shlwapi: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: c9205f17618b37c70f10b2ac419bee5c97c035cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9205f17618b37c70f10b2ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:13:05 2019 +0200 shlwapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/Makefile.in | 2 ++ dlls/shlwapi/assoc.c | 1 - dlls/shlwapi/msgbox.c | 4 --- dlls/shlwapi/ordinal.c | 22 ++++++-------- dlls/shlwapi/path.c | 74 +++++++++++++++++++++++------------------------- dlls/shlwapi/reg.c | 9 +++--- dlls/shlwapi/stopwatch.c | 3 -- dlls/shlwapi/string.c | 26 +++++++---------- dlls/shlwapi/url.c | 7 ++--- 9 files changed, 63 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9205f17618b37c70f10…

1 0

Henri Verbeet : d3drm: Introduce a d3drm_matrix structure.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 203230d1490560671796f55ba5d4e11dd034ce70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=203230d1490560671796f55b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 20 16:09:53 2019 +0430 d3drm: Introduce a d3drm_matrix structure. Since D3DRMMATRIX4D is just a pain to work with. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 15 ++++++++++++++- dlls/d3drm/frame.c | 24 ++++++++++++++---------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 858911f..dcda35f 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -33,6 +33,19 @@ #include "wine/heap.h" #include "wine/list.h" +struct d3drm_matrix +{ + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; +}; + +static inline struct d3drm_matrix *d3drm_matrix(D3DRMMATRIX4D m) +{ + return (struct d3drm_matrix *)m; +} + struct d3drm_object { LONG ref; @@ -71,7 +84,7 @@ struct d3drm_frame SIZE_T nb_lights; SIZE_T lights_size; IDirect3DRMLight **lights; - D3DRMMATRIX4D transform; + struct d3drm_matrix transform; D3DCOLOR scenebackground; DWORD traversal_options; }; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 8bed50b..8bcd1f4 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -23,11 +23,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -static D3DRMMATRIX4D identity = { - { 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 } +static const struct d3drm_matrix identity = +{ + 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, }; struct d3drm_frame_array @@ -941,13 +942,14 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + const struct d3drm_matrix *m = d3drm_matrix(matrix); TRACE("iface %p, type %#x, matrix %p.\n", iface, type, matrix); switch (type) { case D3DRMCOMBINE_REPLACE: - memcpy(frame->transform, matrix, sizeof(D3DRMMATRIX4D)); + frame->transform = *m; break; case D3DRMCOMBINE_BEFORE: @@ -1415,13 +1417,14 @@ static HRESULT WINAPI d3drm_frame3_GetTransform(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_matrix *m = d3drm_matrix(matrix); TRACE("iface %p, reference %p, matrix %p.\n", iface, reference, matrix); if (reference) - FIXME("Specifying a frame as the root of the scene different from the current root frame is not supported yet\n"); + FIXME("Ignoring reference frame %p.\n", reference); - memcpy(matrix, frame->transform, sizeof(D3DRMMATRIX4D)); + *m = frame->transform; return D3DRM_OK; } @@ -1429,10 +1432,11 @@ static HRESULT WINAPI d3drm_frame3_GetTransform(IDirect3DRMFrame3 *iface, static HRESULT WINAPI d3drm_frame2_GetTransform(IDirect3DRMFrame2 *iface, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); + struct d3drm_matrix *m = d3drm_matrix(matrix); TRACE("iface %p, matrix %p.\n", iface, matrix); - memcpy(matrix, frame->transform, sizeof(D3DRMMATRIX4D)); + *m = frame->transform; return D3DRM_OK; } @@ -2950,7 +2954,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I d3drm_object_init(&object->obj, classname); - memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); + object->transform = identity; if (parent_frame) {

1 0

Jeff Smith : d3drm: Implement the BEFORE and AFTER frame transform combine types.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: c41b4c2c5454b5242fe8441f62324635f133ef16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c41b4c2c5454b5242fe8441f… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Jun 20 02:47:50 2019 +0430 d3drm: Implement the BEFORE and AFTER frame transform combine types. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 34 +++++++++++++-- dlls/d3drm/tests/d3drm.c | 109 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 133 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 8bcd1f4..1e58926 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -97,6 +97,34 @@ static inline struct d3drm_animation *impl_from_IDirect3DRMAnimation2(IDirect3DR return CONTAINING_RECORD(iface, struct d3drm_animation, IDirect3DRMAnimation2_iface); } +static void d3drm_matrix_multiply_affine(struct d3drm_matrix *dst, + const struct d3drm_matrix *src1, const struct d3drm_matrix *src2) +{ + struct d3drm_matrix tmp; + + tmp._11 = src1->_11 * src2->_11 + src1->_12 * src2->_21 + src1->_13 * src2->_31; + tmp._12 = src1->_11 * src2->_12 + src1->_12 * src2->_22 + src1->_13 * src2->_32; + tmp._13 = src1->_11 * src2->_13 + src1->_12 * src2->_23 + src1->_13 * src2->_33; + tmp._14 = 0.0f; + + tmp._21 = src1->_21 * src2->_11 + src1->_22 * src2->_21 + src1->_23 * src2->_31; + tmp._22 = src1->_21 * src2->_12 + src1->_22 * src2->_22 + src1->_23 * src2->_32; + tmp._23 = src1->_21 * src2->_13 + src1->_22 * src2->_23 + src1->_23 * src2->_33; + tmp._24 = 0.0f; + + tmp._31 = src1->_31 * src2->_11 + src1->_32 * src2->_21 + src1->_33 * src2->_31; + tmp._32 = src1->_31 * src2->_12 + src1->_32 * src2->_22 + src1->_33 * src2->_32; + tmp._33 = src1->_31 * src2->_13 + src1->_32 * src2->_23 + src1->_33 * src2->_33; + tmp._34 = 0.0f; + + tmp._41 = src1->_41 * src2->_11 + src1->_42 * src2->_21 + src1->_43 * src2->_31 + src2->_41; + tmp._42 = src1->_41 * src2->_12 + src1->_42 * src2->_22 + src1->_43 * src2->_32 + src2->_42; + tmp._43 = src1->_41 * src2->_13 + src1->_42 * src2->_23 + src1->_43 * src2->_33 + src2->_43; + tmp._44 = 1.0f; + + *dst = tmp; +} + static HRESULT WINAPI d3drm_frame_array_QueryInterface(IDirect3DRMFrameArray *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -953,15 +981,15 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, break; case D3DRMCOMBINE_BEFORE: - FIXME("D3DRMCOMBINE_BEFORE not supported yet\n"); + d3drm_matrix_multiply_affine(&frame->transform, m, &frame->transform); break; case D3DRMCOMBINE_AFTER: - FIXME("D3DRMCOMBINE_AFTER not supported yet\n"); + d3drm_matrix_multiply_affine(&frame->transform, &frame->transform, m); break; default: - WARN("Unknown Combine Type %u\n", type); + FIXME("Unhandled type %#x.\n", type); return D3DRMERR_BADVALUE; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index cc4f8fe..bd10cc8 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -58,6 +58,32 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +#define expect_matrix(m, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44, u) \ + expect_matrix_(__LINE__, m, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44, u) +static void expect_matrix_(unsigned int line, D3DRMMATRIX4D m, + float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, + float m31, float m32, float m33, float m34, float m41, float m42, float m43, float m44, + unsigned int ulps) +{ + BOOL equal = compare_float(m[0][0], m11, ulps) && compare_float(m[0][1], m12, ulps) + && compare_float(m[0][2], m13, ulps) && compare_float(m[0][3], m14, ulps) + && compare_float(m[1][0], m21, ulps) && compare_float(m[1][1], m22, ulps) + && compare_float(m[1][2], m23, ulps) && compare_float(m[1][3], m24, ulps) + && compare_float(m[2][0], m31, ulps) && compare_float(m[2][1], m32, ulps) + && compare_float(m[2][2], m33, ulps) && compare_float(m[2][3], m34, ulps) + && compare_float(m[3][0], m41, ulps) && compare_float(m[3][1], m42, ulps) + && compare_float(m[3][2], m43, ulps) && compare_float(m[3][3], m44, ulps); + + ok_(__FILE__, line)(equal, + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, " + "%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e}, " + "expected {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, " + "%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + m[0][0], m[0][1], m[0][2], m[0][3], m[1][0], m[1][1], m[1][2], m[1][3], + m[2][0], m[2][1], m[2][2], m[2][3], m[3][0], m[3][1], m[3][2], m[3][3], + m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44); +} + #define check_vector(a, b, c, d, e) check_vector_(__LINE__, a, b, c, d, e) static void check_vector_(unsigned int line, const D3DVECTOR *v, float x, float y, float z, unsigned int ulps) { @@ -82,6 +108,21 @@ static D3DRMMATRIX4D identity = { { 0.0f, 0.0f, 0.0f, 1.0f } }; +static void frame_set_transform(IDirect3DRMFrame *frame, + float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, + float m31, float m32, float m33, float m34, float m41, float m42, float m43, float m44) +{ + D3DRMMATRIX4D matrix = + { + {m11, m12, m13, m14}, + {m21, m22, m23, m24}, + {m31, m32, m33, m34}, + {m41, m42, m43, m44}, + }; + + IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, matrix); +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -2711,20 +2752,74 @@ cleanup: static void test_frame_transform(void) { - HRESULT hr; - IDirect3DRM *d3drm; + D3DRMMATRIX4D matrix, add_matrix; IDirect3DRMFrame *frame; - D3DRMMATRIX4D matrix; + IDirect3DRM *d3drm; + HRESULT hr; hr = Direct3DRMCreate(&d3drm); - ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame); - ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMFrame_GetTransform(frame, matrix); - ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetTransform returned hr = %x\n", hr); - ok(!memcmp(matrix, identity, sizeof(D3DRMMATRIX4D)), "Returned matrix is not identity\n"); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 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, 0); + + memcpy(add_matrix, identity, sizeof(add_matrix)); + add_matrix[3][0] = 3.0f; + add_matrix[3][1] = 3.0f; + add_matrix[3][2] = 3.0f; + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_BEFORE, add_matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 6.0f, 6.0f, 6.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_AFTER, add_matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm);

1 0

Jeff Smith : d3drm: Validate that the transformation is affine in d3drm_frame3_AddTransform() .
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 530964855334131b2c02a9339fc4be44de72e950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=530964855334131b2c02a933… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Jun 20 02:47:51 2019 +0430 d3drm: Validate that the transformation is affine in d3drm_frame3_AddTransform(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 3 +++ dlls/d3drm/tests/d3drm.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 1e58926..c55d56a 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -974,6 +974,9 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, TRACE("iface %p, type %#x, matrix %p.\n", iface, type, matrix); + if (m->_14 != 0.0f || m->_24 != 0.0f || m->_34 != 0.0f || m->_44 != 1.0f) + return D3DRMERR_BADVALUE; + switch (type) { case D3DRMCOMBINE_REPLACE: diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index bd10cc8..78a4388 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2821,6 +2821,10 @@ static void test_frame_transform(void) 0.0f, 0.0f, 2.0f, 0.0f, 3.0f, 3.0f, 3.0f, 1.0f, 1); + add_matrix[3][3] = 2.0f; + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); }

1 0

Jeff Smith : d3drm: Implement d3drm_frame3_AddTranslation().
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 11fe8e4b6a4a5702b06a1b068b67ab926c3fb89e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11fe8e4b6a4a5702b06a1b06… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Jun 20 02:47:52 2019 +0430 d3drm: Implement d3drm_frame3_AddTranslation(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 44 ++++++++++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index c55d56a..e614af6 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1022,25 +1022,57 @@ static HRESULT WINAPI d3drm_frame1_AddTransform(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddTranslation(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e stub!\n", iface, type, x, y, z); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e.\n", iface, type, x, y, z); + + switch (type) + { + case D3DRMCOMBINE_REPLACE: + frame->transform = identity; + frame->transform._41 = x; + frame->transform._42 = y; + frame->transform._43 = z; + break; + + case D3DRMCOMBINE_BEFORE: + frame->transform._41 += x * frame->transform._11 + y * frame->transform._21 + z * frame->transform._31; + frame->transform._42 += x * frame->transform._12 + y * frame->transform._22 + z * frame->transform._32; + frame->transform._43 += x * frame->transform._13 + y * frame->transform._23 + z * frame->transform._33; + break; + + case D3DRMCOMBINE_AFTER: + frame->transform._41 += x; + frame->transform._42 += y; + frame->transform._43 += z; + break; + + default: + FIXME("Unhandled type %#x.\n", type); + return D3DRMERR_BADVALUE; + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_AddTranslation(IDirect3DRMFrame2 *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e stub!\n", iface, type, x, y, z); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e.\n", iface, type, x, y, z); + + return d3drm_frame3_AddTranslation(&frame->IDirect3DRMFrame3_iface, type, x, y, z); } static HRESULT WINAPI d3drm_frame1_AddTranslation(IDirect3DRMFrame *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e stub!\n", iface, type, x, y, z); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e.\n", iface, type, x, y, z); + + return d3drm_frame3_AddTranslation(&frame->IDirect3DRMFrame3_iface, type, x, y, z); } static HRESULT WINAPI d3drm_frame3_AddScale(IDirect3DRMFrame3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 78a4388..a2fde98 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2825,6 +2825,51 @@ static void test_frame_transform(void) hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix); ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_REPLACE, 3.0f, 3.0f, 3.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_BEFORE, 3.0f, 3.0f, 3.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 6.0f, 6.0f, 6.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_AFTER, 3.0f, 3.0f, 3.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); }

1 0