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

Matteo Bruni : d3dx9/tests: Avoid SIZE_T in traces.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: df07533a800266a725224b33ec6aef02bfb0b148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df07533a800266a725224b33e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 9 21:19:39 2017 +0200 d3dx9/tests: Avoid SIZE_T in traces. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8882907..ff3b098 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -177,17 +177,17 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const } #define expect_vec4_array(count, expected, vector, ulps) expect_vec4_array_(__LINE__, count, expected, vector, ulps) -static void expect_vec4_array_(unsigned int line, SIZE_T count, const D3DXVECTOR4 *expected, +static void expect_vec4_array_(unsigned int line, unsigned int count, const D3DXVECTOR4 *expected, const D3DXVECTOR4 *vector, unsigned int ulps) { BOOL equal; - SIZE_T i; + unsigned int i; for (i = 0; i < count; ++i) { equal = compare_vec4(&expected[i], &vector[i], ulps); ok_(__FILE__, line)(equal, - "Got unexpected vector {%.8e, %.8e, %.8e, %.8e} at index %lu, expected {%.8e, %.8e, %.8e, %.8e}.\n", + "Got unexpected vector {%.8e, %.8e, %.8e, %.8e} at index %u, expected {%.8e, %.8e, %.8e, %.8e}.\n", vector[i].x, vector[i].y, vector[i].z, vector[i].w, i, expected[i].x, expected[i].y, expected[i].z, expected[i].w); if (!equal)

1 0

Fabian Maurer : comctl32/taskdialog: Added support for custom buttons.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 5b06498b937c3ab88de32d4cb5cfcffb20f0d6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b06498b937c3ab88de32d4cb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jun 11 22:11:46 2017 +0300 comctl32/taskdialog: Added support for custom buttons. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 249 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 192 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b06498b937c3ab88de32…

1 0

Jacek Caban : wininet/tests: Silence noisy traces.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: a0af1eba27f744a2cfc7fd085558ca8cd2431294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0af1eba27f744a2cfc7fd085… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 12 08:53:53 2017 +0200 wininet/tests: Silence noisy traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 147 +++++++++++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0af1eba27f744a2cfc7f…

1 0

Miklós Máté : quartz: Small readability fix.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: bf9eaac54409ef149c3da4b083f2dd839101354c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9eaac54409ef149c3da4b08… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Sun Jun 11 00:22:58 2017 +0200 quartz: Small readability fix. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 13f0d89..d9e4f46 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -383,7 +383,7 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY ERR("Format type %s not supported\n", debugstr_guid(&pmt->formattype)); return S_FALSE; } - if (This->bmiheader.biCompression) + if (This->bmiheader.biCompression != BI_RGB) return S_FALSE; return S_OK; }

1 0

Andrey Gusev : d3d11/tests: Fix a typo in ok() message.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 6905ea5fb273015f36616705d6c2c56a33832708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6905ea5fb273015f36616705d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 9 17:02:12 2017 +0300 d3d11/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5565143..69d8517 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19808,7 +19808,7 @@ static void test_gather(void) hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); - ok(SUCCEEDED(hr), "Fialed to create shader resource view, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); constant.width = texture_desc.Width;

1 0

Nikolay Sivov : d3drm/tests: Add helpers to test vectors.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: ee89ee91ecb60aa93b9d4d0e0706a8acedee84b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee89ee91ecb60aa93b9d4d0e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 11 18:52:24 2017 +0300 d3drm/tests: Add helpers to test vectors. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 144 +++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee89ee91ecb60aa93b9d4…

1 0

Nikolay Sivov : include: Fix IDirect3DRMFace*::GetColor() macros.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 60c4fbda45f935d1ac1f4f0a0de65a3029c6b35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c4fbda45f935d1ac1f4f0a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 11 18:52:25 2017 +0300 include: Fix IDirect3DRMFace*::GetColor() macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3drmobj.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index dc1ba08..5ff33fe 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2335,7 +2335,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace,IDirect3DRMObject) #define IDirect3DRMFace_GetVertexCount(p) (p)->lpVtbl->GetVertexCount(p) #define IDirect3DRMFace_GetVertexIndex(p,a) (p)->lpVtbl->GetVertexIndex(p,a) #define IDirect3DRMFace_GetTextureCoordinateIndex(p,a) (p)->lpVtbl->GetTextureCoordinateIndex(p,a) -#define IDirect3DRMFace_GetColor(p,a) (p)->lpVtbl->GetColor(p,a) +#define IDirect3DRMFace_GetColor(p) (p)->lpVtbl->GetColor(p) #else /*** IUnknown methods ***/ #define IDirect3DRMFace_QueryInterface(p,a,b) (p)->QueryInterface(a,b) @@ -2368,7 +2368,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace,IDirect3DRMObject) #define IDirect3DRMFace_GetVertexCount(p) (p)->GetVertexCount() #define IDirect3DRMFace_GetVertexIndex(p,a) (p)->GetVertexIndex(a) #define IDirect3DRMFace_GetTextureCoordinateIndex(p,a) (p)->GetTextureCoordinateIndex(a) -#define IDirect3DRMFace_GetColor(p,a) (p)->GetColor(a) +#define IDirect3DRMFace_GetColor(p) (p)->GetColor() #endif /***************************************************************************** @@ -2445,7 +2445,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace2,IDirect3DRMObject) #define IDirect3DRMFace2_GetVertexCount(p) (p)->lpVtbl->GetVertexCount(p) #define IDirect3DRMFace2_GetVertexIndex(p,a) (p)->lpVtbl->GetVertexIndex(p,a) #define IDirect3DRMFace2_GetTextureCoordinateIndex(p,a) (p)->lpVtbl->GetTextureCoordinateIndex(p,a) -#define IDirect3DRMFace2_GetColor(p,a) (p)->lpVtbl->GetColor(p,a) +#define IDirect3DRMFace2_GetColor(p) (p)->lpVtbl->GetColor(p) #else /*** IUnknown methods ***/ #define IDirect3DRMFace2_QueryInterface(p,a,b) (p)->QueryInterface(a,b) @@ -2478,7 +2478,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace2,IDirect3DRMObject) #define IDirect3DRMFace2_GetVertexCount(p) (p)->GetVertexCount() #define IDirect3DRMFace2_GetVertexIndex(p,a) (p)->GetVertexIndex(a) #define IDirect3DRMFace2_GetTextureCoordinateIndex(p,a) (p)->GetTextureCoordinateIndex(a) -#define IDirect3DRMFace2_GetColor(p,a) (p)->GetColor(a) +#define IDirect3DRMFace2_GetColor(p) (p)->GetColor() #endif /*****************************************************************************

1 0

Nikolay Sivov : d3drm: Make it possible to create frames with CreateObject ().
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 02c085e3133c1df8c198930e7646f6736fb28689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c085e3133c1df8c198930e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 11 18:52:27 2017 +0300 d3drm: Make it possible to create frames with CreateObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 14 ++++++++++++++ dlls/d3drm/frame.c | 40 ++++++++++++++++++++++++++++------------ dlls/d3drm/tests/d3drm.c | 22 ++++++++++++++-------- 3 files changed, 56 insertions(+), 20 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 2b4e87c..ae08fdf 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -110,6 +110,19 @@ static HRESULT d3drm_create_mesh_builder_object(void **object, IDirect3DRM *d3dr return hr; } +static HRESULT d3drm_create_frame_object(void **object, IDirect3DRM *d3drm) +{ + struct d3drm_frame *frame; + HRESULT hr; + + if (FAILED(hr = d3drm_frame_create(&frame, NULL, d3drm))) + return hr; + + *object = &frame->IDirect3DRMFrame_iface; + + return hr; +} + struct d3drm { IDirect3DRM IDirect3DRM_iface; @@ -1257,6 +1270,7 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, {&CLSID_CDirect3DRMViewport, d3drm_create_viewport_object}, {&CLSID_CDirect3DRMFace, d3drm_create_face_object}, {&CLSID_CDirect3DRMMeshBuilder, d3drm_create_mesh_builder_object}, + {&CLSID_CDirect3DRMFrame, d3drm_create_frame_object}, }; TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 99b8ce0..eda2c04 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -533,6 +533,7 @@ static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface) if (!refcount) { + d3drm_object_cleanup((IDirect3DRMObject *)&frame->IDirect3DRMFrame_iface, &frame->obj); for (i = 0; i < frame->nb_children; ++i) { IDirect3DRMFrame3_Release(frame->children[i]); @@ -548,6 +549,7 @@ static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface) IDirect3DRMLight_Release(frame->lights[i]); } HeapFree(GetProcessHeap(), 0, frame->lights); + IDirect3DRM_Release(frame->d3drm); HeapFree(GetProcessHeap(), 0, frame); } @@ -599,49 +601,61 @@ static HRESULT WINAPI d3drm_frame1_Clone(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddDestroyCallback(IDirect3DRMFrame3 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&frame->obj, cb, ctx); } static HRESULT WINAPI d3drm_frame2_AddDestroyCallback(IDirect3DRMFrame2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return IDirect3DRMFrame3_AddDestroyCallback(&frame->IDirect3DRMFrame3_iface, cb, ctx); } static HRESULT WINAPI d3drm_frame1_AddDestroyCallback(IDirect3DRMFrame *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return IDirect3DRMFrame3_AddDestroyCallback(&frame->IDirect3DRMFrame3_iface, cb, ctx); } static HRESULT WINAPI d3drm_frame3_DeleteDestroyCallback(IDirect3DRMFrame3 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&frame->obj, cb, ctx); } static HRESULT WINAPI d3drm_frame2_DeleteDestroyCallback(IDirect3DRMFrame2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return IDirect3DRMFrame3_DeleteDestroyCallback(&frame->IDirect3DRMFrame3_iface, cb, ctx); } static HRESULT WINAPI d3drm_frame1_DeleteDestroyCallback(IDirect3DRMFrame *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return IDirect3DRMFrame3_DeleteDestroyCallback(&frame->IDirect3DRMFrame3_iface, cb, ctx); } static HRESULT WINAPI d3drm_frame3_SetAppData(IDirect3DRMFrame3 *iface, DWORD data) @@ -2959,6 +2973,8 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I IDirect3DRMFrame3_AddChild(p, &object->IDirect3DRMFrame3_iface); } + IDirect3DRM_AddRef(object->d3drm); + *frame = object; return hr; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d5c1bcd..971e95c 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -907,15 +907,19 @@ static void test_Frame(void) IDirect3DRMLight *light1; IDirect3DRMLight *light_tmp; IDirect3DRMLightArray *light_array; + ULONG ref, ref2; D3DCOLOR color; DWORD count; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + ref = get_refcount((IUnknown *)d3drm); hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameC); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameC, 1); + ref2 = get_refcount((IUnknown *)d3drm); + ok(ref2 > ref, "Expected d3drm object to be referenced.\n"); test_class_name((IDirect3DRMObject *)pFrameC, "Frame"); @@ -1396,6 +1400,9 @@ static void test_object(void) { &CLSID_CDirect3DRMMeshBuilder, &IID_IDirect3DRMMeshBuilder }, { &CLSID_CDirect3DRMMeshBuilder, &IID_IDirect3DRMMeshBuilder2 }, { &CLSID_CDirect3DRMMeshBuilder, &IID_IDirect3DRMMeshBuilder3 }, + { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame }, + { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame2 }, + { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame3 }, }; IDirect3DRM *d3drm1; IDirect3DRM2 *d3drm2; @@ -1419,7 +1426,8 @@ static void test_object(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { - BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder); + BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder) || + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame); unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); @@ -1439,7 +1447,7 @@ static void test_object(void) { ref2 = get_refcount((IUnknown *)d3drm1); if (takes_ref) - ok(ref2 == ref1 + 1, "Test %u: expected ref2 == ref1 + 1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); else ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); @@ -1462,7 +1470,7 @@ static void test_object(void) ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); ref2 = get_refcount((IUnknown *)d3drm1); if (takes_ref) - ok(ref2 == ref1 + 1, "Test %u: expected ref2 == ref1 + 1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); else ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); @@ -1481,7 +1489,7 @@ static void test_object(void) ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); ref2 = get_refcount((IUnknown *)d3drm1); if (takes_ref) - ok(ref2 == ref1 + 1, "Test %u: expected ref2 == ref1 + 1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); else ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); @@ -2019,8 +2027,7 @@ static void test_Viewport(void) IDirect3DRMDevice3_Release(device3); IDirect3DRMDevice_Release(device1); ref4 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, - ref4); + ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4); ref4 = get_refcount((IUnknown *)d3drm2); ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4); ref4 = get_refcount((IUnknown *)d3drm3); @@ -2032,8 +2039,7 @@ static void test_Viewport(void) IDirect3DRMFrame3_Release(frame3); ref4 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, - ref4); + ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4); ref4 = get_refcount((IUnknown *)d3drm2); ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4); ref4 = get_refcount((IUnknown *)d3drm3);

1 0

Nikolay Sivov : d3drm: Make it possible to create light objects using CreateObject().
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: f43dfe5c088c8d1ed5428f4571fcafcf7ab0c7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43dfe5c088c8d1ed5428f457… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 11 18:52:28 2017 +0300 d3drm: Make it possible to create light objects using CreateObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 34 ++++++++++++++++++++++++++++------ dlls/d3drm/d3drm_private.h | 18 +++++++++++++++++- dlls/d3drm/light.c | 40 ++++++++++++++++++---------------------- dlls/d3drm/tests/d3drm.c | 9 ++++++++- 4 files changed, 71 insertions(+), 30 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index ae08fdf..bf5721c 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -123,6 +123,19 @@ static HRESULT d3drm_create_frame_object(void **object, IDirect3DRM *d3drm) return hr; } +static HRESULT d3drm_create_light_object(void **object, IDirect3DRM *d3drm) +{ + struct d3drm_light *light; + HRESULT hr; + + if (FAILED(hr = d3drm_light_create(&light, d3drm))) + return hr; + + *object = &light->IDirect3DRMLight_iface; + + return hr; +} + struct d3drm { IDirect3DRM IDirect3DRM_iface; @@ -1271,6 +1284,7 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, {&CLSID_CDirect3DRMFace, d3drm_create_face_object}, {&CLSID_CDirect3DRMMeshBuilder, d3drm_create_mesh_builder_object}, {&CLSID_CDirect3DRMFrame, d3drm_create_frame_object}, + {&CLSID_CDirect3DRMLight, d3drm_create_light_object}, }; TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", @@ -1419,33 +1433,41 @@ static HRESULT WINAPI d3drm3_CreateTexture(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateLight(IDirect3DRM3 *iface, D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_light *object; HRESULT hr; FIXME("iface %p, type %#x, color 0x%08x, light %p partial stub!\n", iface, type, color, light); - if (SUCCEEDED(hr = Direct3DRMLight_create((IUnknown **)light))) + if (SUCCEEDED(hr = d3drm_light_create(&object, &d3drm->IDirect3DRM_iface))) { - IDirect3DRMLight_SetType(*light, type); - IDirect3DRMLight_SetColor(*light, color); + IDirect3DRMLight_SetType(&object->IDirect3DRMLight_iface, type); + IDirect3DRMLight_SetColor(&object->IDirect3DRMLight_iface, color); } + *light = &object->IDirect3DRMLight_iface; + return hr; } static HRESULT WINAPI d3drm3_CreateLightRGB(IDirect3DRM3 *iface, D3DRMLIGHTTYPE type, D3DVALUE red, D3DVALUE green, D3DVALUE blue, IDirect3DRMLight **light) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_light *object; HRESULT hr; FIXME("iface %p, type %#x, red %.8e, green %.8e, blue %.8e, light %p partial stub!\n", iface, type, red, green, blue, light); - if (SUCCEEDED(hr = Direct3DRMLight_create((IUnknown **)light))) + if (SUCCEEDED(hr = d3drm_light_create(&object, &d3drm->IDirect3DRM_iface))) { - IDirect3DRMLight_SetType(*light, type); - IDirect3DRMLight_SetColorRGB(*light, red, green, blue); + IDirect3DRMLight_SetType(&object->IDirect3DRMLight_iface, type); + IDirect3DRMLight_SetColorRGB(&object->IDirect3DRMLight_iface, red, green, blue); } + *light = &object->IDirect3DRMLight_iface; + return hr; } diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index f78200d..41f0c50 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -147,6 +147,22 @@ struct d3drm_mesh_builder DWORD *material_indices; }; +struct d3drm_light +{ + struct d3drm_object obj; + IDirect3DRMLight IDirect3DRMLight_iface; + LONG ref; + IDirect3DRM *d3drm; + D3DRMLIGHTTYPE type; + D3DCOLOR color; + D3DVALUE range; + D3DVALUE cattenuation; + D3DVALUE lattenuation; + D3DVALUE qattenuation; + D3DVALUE umbra; + D3DVALUE penumbra; +}; + HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_device_create_surfaces_from_clipper(struct d3drm_device *object, IDirectDraw *ddraw, IDirectDrawClipper *clipper, int width, int height, IDirectDrawSurface **surface) DECLSPEC_HIDDEN; @@ -168,7 +184,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I HRESULT d3drm_face_create(struct d3drm_face **face) DECLSPEC_HIDDEN; HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; +HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 20430f9..0afd32b 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -25,21 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -struct d3drm_light -{ - struct d3drm_object obj; - IDirect3DRMLight IDirect3DRMLight_iface; - LONG ref; - D3DRMLIGHTTYPE type; - D3DCOLOR color; - D3DVALUE range; - D3DVALUE cattenuation; - D3DVALUE lattenuation; - D3DVALUE qattenuation; - D3DVALUE umbra; - D3DVALUE penumbra; -}; - static inline struct d3drm_light *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) { return CONTAINING_RECORD(iface, struct d3drm_light, IDirect3DRMLight_iface); @@ -50,6 +35,7 @@ static HRESULT WINAPI d3drm_light_QueryInterface(IDirect3DRMLight *iface, REFIID TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DRMLight) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DRMLight_AddRef(iface); @@ -81,7 +67,11 @@ static ULONG WINAPI d3drm_light_Release(IDirect3DRMLight *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + d3drm_object_cleanup((IDirect3DRMObject *)iface, &light->obj); + IDirect3DRM_Release(light->d3drm); HeapFree(GetProcessHeap(), 0, light); + } return refcount; } @@ -97,17 +87,21 @@ static HRESULT WINAPI d3drm_light_Clone(IDirect3DRMLight *iface, static HRESULT WINAPI d3drm_light_AddDestroyCallback(IDirect3DRMLight *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&light->obj, cb, ctx); } static HRESULT WINAPI d3drm_light_DeleteDestroyCallback(IDirect3DRMLight *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&light->obj, cb, ctx); } static HRESULT WINAPI d3drm_light_SetAppData(IDirect3DRMLight *iface, DWORD data) @@ -367,22 +361,24 @@ static const struct IDirect3DRMLightVtbl d3drm_light_vtbl = d3drm_light_GetEnableFrame, }; -HRESULT Direct3DRMLight_create(IUnknown **out) +HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm) { static const char classname[] = "Light"; struct d3drm_light *object; - TRACE("out %p.\n", out); + TRACE("light %p.\n", light); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMLight_iface.lpVtbl = &d3drm_light_vtbl; object->ref = 1; + object->d3drm = d3drm; + IDirect3DRM_AddRef(object->d3drm); d3drm_object_init(&object->obj, classname); - *out = (IUnknown *)&object->IDirect3DRMLight_iface; + *light = object; return S_OK; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 971e95c..fc19b97 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1403,6 +1403,7 @@ static void test_object(void) { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame }, { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame2 }, { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame3 }, + { &CLSID_CDirect3DRMLight, &IID_IDirect3DRMLight }, }; IDirect3DRM *d3drm1; IDirect3DRM2 *d3drm2; @@ -1427,7 +1428,8 @@ static void test_object(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder) || - IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame); + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame) || + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight); unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); @@ -2062,6 +2064,7 @@ static void test_Viewport(void) static void test_Light(void) { + IDirect3DRMObject *object; HRESULT hr; IDirect3DRM *d3drm; IDirect3DRMLight *light; @@ -2074,6 +2077,10 @@ static void test_Light(void) hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &light); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); + hr = IDirect3DRMLight_QueryInterface(light, &IID_IDirect3DRMObject, (void **)&object); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#x.\n", hr); + IDirect3DRMObject_Release(object); + test_class_name((IDirect3DRMObject *)light, "Light"); type = IDirect3DRMLight_GetType(light);

1 0

Henri Verbeet : wined3d: Also check for "Mesa" in GL_VERSION in wined3d_guess_gl_vendor().
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 1d3a8a5ded30674681c335714bb019a561e88e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3a8a5ded30674681c335714… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 12 14:01:43 2017 +0200 wined3d: Also check for "Mesa" in GL_VERSION in wined3d_guess_gl_vendor(). The existing checks should be sufficient, but the GL_VERSION one is potentially more reliable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7ad944f..9707f81 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1761,7 +1761,7 @@ static DWORD wined3d_parse_gl_version(const char *gl_version) } static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_info *gl_info, - const char *gl_vendor_string, const char *gl_renderer) + const char *gl_vendor_string, const char *gl_renderer, const char *gl_version) { /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to @@ -1792,7 +1792,8 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in || strstr(gl_vendor_string, "Intel") || strstr(gl_renderer, "Mesa") || strstr(gl_renderer, "Gallium") - || strstr(gl_renderer, "Intel")) + || strstr(gl_renderer, "Intel") + || strstr(gl_version, "Mesa")) return GL_VENDOR_MESA; FIXME("Received unrecognized GL_VENDOR %s. Returning GL_VENDOR_UNKNOWN.\n", @@ -4350,7 +4351,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, checkGLcall("creating VAO"); } - gl_vendor = wined3d_guess_gl_vendor(gl_info, gl_vendor_str, gl_renderer_str); + gl_vendor = wined3d_guess_gl_vendor(gl_info, gl_vendor_str, gl_renderer_str, gl_version_str); TRACE("Guessed GL vendor %#x.\n", gl_vendor); if (!(gpu_description = query_gpu_description(gl_info, &vram_bytes)))

1 0