wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Aaryaman Vasishta : d3drm/tests: Modify all QI tests to compare vtables.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 88f6c2aa2e09c13ae5915eaedc5c4631fed00801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f6c2aa2e09c13ae5915eaed… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Jun 19 04:17:11 2016 +0530 d3drm/tests: Modify all QI tests to compare vtables. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/device.c | 8 +- dlls/d3drm/tests/d3drm.c | 552 ++++++++++++++++++++++++----------------------- dlls/d3drm/texture.c | 10 +- 3 files changed, 290 insertions(+), 280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88f6c2aa2e09c13ae5915…

1 0

Aaryaman Vasishta : d3drm: Fix viewport object creation.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: f585faff6bb944764e838c2b4777e277856aa3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f585faff6bb944764e838c2b4… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Jun 20 01:16:09 2016 +0530 d3drm: Fix viewport object creation. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 26 +++++++++++++++++++++++--- dlls/d3drm/d3drm_private.h | 14 +++++++++++++- dlls/d3drm/viewport.c | 21 ++++----------------- 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 4f1f840..8d054b5 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -400,10 +400,12 @@ static HRESULT WINAPI d3drm1_CreateShadow(IDirect3DRM *iface, IDirect3DRMVisual static HRESULT WINAPI d3drm1_CreateViewport(IDirect3DRM *iface, IDirect3DRMDevice *device, IDirect3DRMFrame *camera, DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport **viewport) { + struct d3drm *d3drm = impl_from_IDirect3DRM(iface); + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n", iface, device, camera, x, y, width, height, viewport); - return Direct3DRMViewport_create(&IID_IDirect3DRMViewport, (IUnknown **)viewport); + return IDirect3DRM2_CreateViewport(&d3drm->IDirect3DRM2_iface, device, camera, x, y, width, height, viewport); } static HRESULT WINAPI d3drm1_CreateWrap(IDirect3DRM *iface, D3DRMWRAPTYPE type, IDirect3DRMFrame *frame, @@ -861,10 +863,19 @@ static HRESULT WINAPI d3drm2_CreateShadow(IDirect3DRM2 *iface, IDirect3DRMVisual static HRESULT WINAPI d3drm2_CreateViewport(IDirect3DRM2 *iface, IDirect3DRMDevice *device, IDirect3DRMFrame *camera, DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport **viewport) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + struct d3drm_viewport *object; + HRESULT hr; + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n", iface, device, camera, x, y, width, height, viewport); - return Direct3DRMViewport_create(&IID_IDirect3DRMViewport, (IUnknown **)viewport); + if (FAILED(hr = d3drm_viewport_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *viewport = &object->IDirect3DRMViewport_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm2_CreateWrap(IDirect3DRM2 *iface, D3DRMWRAPTYPE type, IDirect3DRMFrame *frame, @@ -1423,10 +1434,19 @@ static HRESULT WINAPI d3drm3_CreateTextureFromSurface(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevice3 *device, IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport2 **viewport) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_viewport *object; + HRESULT hr; + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n", iface, device, camera, x, y, width, height, viewport); - return Direct3DRMViewport_create(&IID_IDirect3DRMViewport2, (IUnknown **)viewport); + if (FAILED(hr = d3drm_viewport_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *viewport = &object->IDirect3DRMViewport2_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm3_CreateWrap(IDirect3DRM3 *iface, D3DRMWRAPTYPE type, IDirect3DRMFrame3 *frame, diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 42112bf..06cbdc1 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -65,6 +65,18 @@ struct d3drm_frame D3DCOLOR scenebackground; }; +struct d3drm_viewport +{ + struct d3drm_object obj; + IDirect3DRMViewport IDirect3DRMViewport_iface; + IDirect3DRMViewport2 IDirect3DRMViewport2_iface; + IDirect3DRM *d3drm; + D3DVALUE back; + D3DVALUE front; + D3DVALUE field; + D3DRMPROJECTIONTYPE projection; +}; + void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; @@ -73,6 +85,7 @@ void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) HRESULT d3drm_device_create(struct d3drm_device **out) DECLSPEC_HIDDEN; HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; +HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice2 *IDirect3DRMDevice2_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; @@ -80,7 +93,6 @@ HRESULT Direct3DRMFace_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HIDDEN HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; -HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 98ea582..ab9ccde 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -29,17 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -struct d3drm_viewport -{ - struct d3drm_object obj; - IDirect3DRMViewport IDirect3DRMViewport_iface; - IDirect3DRMViewport2 IDirect3DRMViewport2_iface; - D3DVALUE back; - D3DVALUE front; - D3DVALUE field; - D3DRMPROJECTIONTYPE projection; -}; - static inline struct d3drm_viewport *impl_from_IDirect3DRMViewport(IDirect3DRMViewport *iface) { return CONTAINING_RECORD(iface, struct d3drm_viewport, IDirect3DRMViewport_iface); @@ -829,23 +818,21 @@ static const struct IDirect3DRMViewport2Vtbl d3drm_viewport2_vtbl = d3drm_viewport2_InverseTransformVectors, }; -HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown **out) +HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm) { struct d3drm_viewport *object; - TRACE("riid %s, out %p.\n", debugstr_guid(riid), out); + TRACE("viewport %p, d3drm %p.\n", viewport, d3drm); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMViewport_iface.lpVtbl = &d3drm_viewport1_vtbl; object->IDirect3DRMViewport2_iface.lpVtbl = &d3drm_viewport2_vtbl; + object->d3drm = d3drm; d3drm_object_init(&object->obj); - if (IsEqualGUID(riid, &IID_IDirect3DRMViewport2)) - *out = (IUnknown *)&object->IDirect3DRMViewport2_iface; - else - *out = (IUnknown *)&object->IDirect3DRMViewport_iface; + *viewport = object; return S_OK; }

1 0

Aaryaman Vasishta : d3drm: Fix frame object creation method.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: e6feb9b03112b43b853bc12c33cea01d71b8c20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6feb9b03112b43b853bc12c3… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Jun 20 01:16:08 2016 +0530 d3drm: Fix frame object creation method. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 32 +++++++++++++++++++++++++++++--- dlls/d3drm/d3drm_private.h | 23 ++++++++++++++++++++++- dlls/d3drm/frame.c | 38 +++++++++----------------------------- 3 files changed, 60 insertions(+), 33 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 14fed3a..4f1f840 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -150,9 +150,17 @@ static HRESULT WINAPI d3drm1_CreateObject(IDirect3DRM *iface, static HRESULT WINAPI d3drm1_CreateFrame(IDirect3DRM *iface, IDirect3DRMFrame *parent_frame, IDirect3DRMFrame **frame) { + struct d3drm_frame *object; + HRESULT hr; + TRACE("iface %p, parent_frame %p, frame %p.\n", iface, parent_frame, frame); - return Direct3DRMFrame_create(&IID_IDirect3DRMFrame, (IUnknown *)parent_frame, (IUnknown **)frame); + if (FAILED(hr = d3drm_frame_create(&object, (IUnknown *)parent_frame, iface))) + return hr; + + *frame = &object->IDirect3DRMFrame_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm1_CreateMesh(IDirect3DRM *iface, IDirect3DRMMesh **mesh) @@ -624,9 +632,18 @@ static HRESULT WINAPI d3drm2_CreateObject(IDirect3DRM2 *iface, static HRESULT WINAPI d3drm2_CreateFrame(IDirect3DRM2 *iface, IDirect3DRMFrame *parent_frame, IDirect3DRMFrame2 **frame) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + struct d3drm_frame *object; + HRESULT hr; + TRACE("iface %p, parent_frame %p, frame %p.\n", iface, parent_frame, frame); - return Direct3DRMFrame_create(&IID_IDirect3DRMFrame2, (IUnknown*)parent_frame, (IUnknown**)frame); + if (FAILED(hr = d3drm_frame_create(&object, (IUnknown *)parent_frame, &d3drm->IDirect3DRM_iface))) + return hr; + + *frame = &object->IDirect3DRMFrame2_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm2_CreateMesh(IDirect3DRM2 *iface, IDirect3DRMMesh **mesh) @@ -1126,9 +1143,18 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateFrame(IDirect3DRM3 *iface, IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_frame *object; + HRESULT hr; + TRACE("iface %p, parent %p, frame %p.\n", iface, parent, frame); - return Direct3DRMFrame_create(&IID_IDirect3DRMFrame3, (IUnknown *)parent, (IUnknown **)frame); + if (FAILED(hr = d3drm_frame_create(&object, (IUnknown *)parent, &d3drm->IDirect3DRM_iface))) + return hr; + + *frame = &object->IDirect3DRMFrame3_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm3_CreateMesh(IDirect3DRM3 *iface, IDirect3DRMMesh **mesh) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 817accf..42112bf 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -44,6 +44,27 @@ struct d3drm_texture D3DRMIMAGE *image; }; +struct d3drm_frame +{ + IDirect3DRMFrame IDirect3DRMFrame_iface; + IDirect3DRMFrame2 IDirect3DRMFrame2_iface; + IDirect3DRMFrame3 IDirect3DRMFrame3_iface; + IDirect3DRM *d3drm; + LONG ref; + struct d3drm_frame *parent; + ULONG nb_children; + ULONG children_capacity; + IDirect3DRMFrame3 **children; + ULONG nb_visuals; + ULONG visuals_capacity; + IDirect3DRMVisual **visuals; + ULONG nb_lights; + ULONG lights_capacity; + IDirect3DRMLight **lights; + D3DRMMATRIX4D transform; + D3DCOLOR scenebackground; +}; + void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; @@ -51,11 +72,11 @@ void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) HRESULT d3drm_device_create(struct d3drm_device **out) DECLSPEC_HIDDEN; HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; +HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice2 *IDirect3DRMDevice2_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; HRESULT Direct3DRMFace_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HIDDEN; -HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 395b9ac..e58dd05 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -38,26 +38,6 @@ static D3DRMMATRIX4D identity = { { 0.0f, 0.0f, 0.0f, 1.0f } }; -struct d3drm_frame -{ - IDirect3DRMFrame IDirect3DRMFrame_iface; - IDirect3DRMFrame2 IDirect3DRMFrame2_iface; - IDirect3DRMFrame3 IDirect3DRMFrame3_iface; - LONG ref; - struct d3drm_frame *parent; - ULONG nb_children; - ULONG children_capacity; - IDirect3DRMFrame3** children; - ULONG nb_visuals; - ULONG visuals_capacity; - IDirect3DRMVisual** visuals; - ULONG nb_lights; - ULONG lights_capacity; - IDirect3DRMLight** lights; - D3DRMMATRIX4D transform; - D3DCOLOR scenebackground; -}; - struct d3drm_frame_array { IDirect3DRMFrameArray IDirect3DRMFrameArray_iface; @@ -2926,12 +2906,12 @@ static inline struct d3drm_frame *unsafe_impl_from_IDirect3DRMFrame(IDirect3DRMF return impl_from_IDirect3DRMFrame(iface); } -HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown *parent, IUnknown **out) +HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, IDirect3DRM *d3drm) { struct d3drm_frame *object; - HRESULT hr; + HRESULT hr = D3DRM_OK; - TRACE("riid %s, parent %p, out %p.\n", debugstr_guid(riid), parent, out); + TRACE("frame %p, parent_frame %p, d3drm %p.\n", frame, parent_frame, d3drm); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; @@ -2939,26 +2919,26 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown *parent, IUnknown **out) object->IDirect3DRMFrame_iface.lpVtbl = &d3drm_frame1_vtbl; object->IDirect3DRMFrame2_iface.lpVtbl = &d3drm_frame2_vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &d3drm_frame3_vtbl; + object->d3drm = d3drm; object->ref = 1; object->scenebackground = RGBA_MAKE(0, 0, 0, 0xff); memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); - if (parent) + if (parent_frame) { IDirect3DRMFrame3 *p; - hr = IDirect3DRMFrame_QueryInterface(parent, &IID_IDirect3DRMFrame3, (void**)&p); - if (hr != S_OK) + if (FAILED(hr = IDirect3DRMFrame_QueryInterface(parent_frame, &IID_IDirect3DRMFrame3, (void **)&p))) { HeapFree(GetProcessHeap(), 0, object); return hr; } - IDirect3DRMFrame_Release(parent); + IDirect3DRMFrame_Release(parent_frame); IDirect3DRMFrame3_AddChild(p, &object->IDirect3DRMFrame3_iface); } - hr = IDirect3DRMFrame3_QueryInterface(&object->IDirect3DRMFrame3_iface, riid, (void **)out); - IDirect3DRMFrame3_Release(&object->IDirect3DRMFrame3_iface); + *frame = object; + return hr; }

1 0

Aaryaman Vasishta : d3drm: Add stubs for IDirect3DRMFrame interface.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: e6f11af27258dfe283e6e324ea58c8f5286ba2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f11af27258dfe283e6e324e… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Jun 20 01:16:07 2016 +0530 d3drm: Add stubs for IDirect3DRMFrame interface. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(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 | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 658 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6f11af27258dfe283e6e…

1 0

Aaryaman Vasishta : d3drm: Rearrange version 2 functions after version 3 for IDirect3DRMFrame*.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: ad1d0f4f15c943eac763eca47c4c40f525309852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1d0f4f15c943eac763eca47… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Jun 19 04:17:07 2016 +0530 d3drm: Rearrange version 2 functions after version 3 for IDirect3DRMFrame*. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(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 | 1464 ++++++++++++++++++++++++++-------------------------- 1 file changed, 733 insertions(+), 731 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad1d0f4f15c943eac763e…

1 0

Alexandre Julliard : gdi32: Fix updating the current position in PolyDraw.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: c500713dd3ceedc8334f97f0245203736858d56a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c500713dd3ceedc8334f97f02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 20:00:30 2016 +0900 gdi32: Fix updating the current position in PolyDraw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/painting.c | 6 ++- dlls/gdi32/path.c | 42 ++++++++--------- dlls/gdi32/tests/path.c | 117 ++++++++++++++++++++++++++++++++++++------------ 3 files changed, 113 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c500713dd3ceedc8334f9…

1 0

Alexandre Julliard : gdi32: Don't modify the DC arc direction in AngleArc.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: dfa3c6885421fc5511ed2f3903d524642cb558cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa3c6885421fc5511ed2f390… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 20:00:04 2016 +0900 gdi32: Don't modify the DC arc direction in AngleArc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 985d4e5..32a340f 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -968,7 +968,7 @@ static BOOL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) * else FALSE. */ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, - INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines ) + INT xStart, INT yStart, INT xEnd, INT yEnd, int direction, int lines ) { struct path_physdev *physdev = get_path_physdev( dev ); double angleStart, angleEnd, angleStartQuadrant, angleEndQuadrant=0.0; @@ -977,7 +977,7 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, FLOAT_POINT corners[2], pointStart, pointEnd; POINT centre; BOOL start, end; - INT temp, direction = GetArcDirection(dev->hdc); + INT temp; /* FIXME: Do we have to respect newStroke? */ @@ -1111,17 +1111,12 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, */ static BOOL pathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT eStartAngle, FLOAT eSweepAngle) { - INT x1, y1, x2, y2, arcdir; - BOOL ret; - - x1 = GDI_ROUND( x + cos(eStartAngle*M_PI/180) * radius ); - y1 = GDI_ROUND( y - sin(eStartAngle*M_PI/180) * radius ); - x2 = GDI_ROUND( x + cos((eStartAngle+eSweepAngle)*M_PI/180) * radius ); - y2 = GDI_ROUND( y - sin((eStartAngle+eSweepAngle)*M_PI/180) * radius ); - arcdir = SetArcDirection( dev->hdc, eSweepAngle >= 0 ? AD_COUNTERCLOCKWISE : AD_CLOCKWISE); - ret = PATH_Arc( dev, x-radius, y-radius, x+radius, y+radius, x1, y1, x2, y2, -1 ); - SetArcDirection( dev->hdc, arcdir ); - return ret; + int x1 = GDI_ROUND( x + cos(eStartAngle*M_PI/180) * radius ); + int y1 = GDI_ROUND( y - sin(eStartAngle*M_PI/180) * radius ); + int x2 = GDI_ROUND( x + cos((eStartAngle+eSweepAngle)*M_PI/180) * radius ); + int y2 = GDI_ROUND( y - sin((eStartAngle+eSweepAngle)*M_PI/180) * radius ); + return PATH_Arc( dev, x-radius, y-radius, x+radius, y+radius, x1, y1, x2, y2, + eSweepAngle >= 0 ? AD_COUNTERCLOCKWISE : AD_CLOCKWISE, -1 ); } @@ -1131,7 +1126,8 @@ static BOOL pathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT eSt static BOOL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { - return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 0 ); + return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, + GetArcDirection( dev->hdc ), 0 ); } @@ -1141,7 +1137,8 @@ static BOOL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { - return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, -1 ); + return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, + GetArcDirection( dev->hdc ), -1 ); } @@ -1151,7 +1148,8 @@ static BOOL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom static BOOL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { - return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 1); + return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, + GetArcDirection( dev->hdc ), 1 ); } @@ -1161,7 +1159,8 @@ static BOOL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom static BOOL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { - return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 2 ); + return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, + GetArcDirection( dev->hdc ), 2 ); } @@ -1170,7 +1169,7 @@ static BOOL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, */ static BOOL pathdrv_Ellipse( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) { - return PATH_Arc( dev, x1, y1, x2, y2, x1, (y1+y2)/2, x1, (y1+y2)/2, 0 ) && CloseFigure( dev->hdc ); + return PATH_Arc( dev, x1, y1, x2, y2, x1, (y1+y2)/2, x1, (y1+y2)/2, GetArcDirection( dev->hdc ), 1 ); }

1 0

Alexandre Julliard : gdi32: Keep track of the last move position in a path.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 4ea71903619dfffcfcdf65c8af722a0f873a4ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea71903619dfffcfcdf65c8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 19:56:57 2016 +0900 gdi32: Keep track of the last move position in a path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 156ceb6..985d4e5 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -88,6 +88,7 @@ struct gdi_path int count; int allocated; BOOL newStroke; + POINT pos; /* current cursor position */ }; struct path_physdev @@ -129,6 +130,7 @@ static struct gdi_path *alloc_gdi_path( int count ) path->count = 0; path->allocated = count; path->newStroke = TRUE; + path->pos.x = path->pos.y = 0; return path; } @@ -143,6 +145,7 @@ static struct gdi_path *copy_gdi_path( const struct gdi_path *src_path ) } path->count = path->allocated = src_path->count; path->newStroke = src_path->newStroke; + path->pos = src_path->pos; path->points = HeapAlloc( GetProcessHeap(), 0, path->count * sizeof(*path->points) ); path->flags = HeapAlloc( GetProcessHeap(), 0, path->count * sizeof(*path->flags) ); if (!path->points || !path->flags) @@ -276,7 +279,6 @@ static BYTE *add_points( struct gdi_path *path, const POINT *points, DWORD count /* start a new path stroke if necessary */ static BOOL start_new_stroke( struct path_physdev *physdev ) { - POINT pos; struct gdi_path *path = physdev->path; if (!path->newStroke && path->count && @@ -284,8 +286,14 @@ static BOOL start_new_stroke( struct path_physdev *physdev ) return TRUE; path->newStroke = FALSE; - GetCurrentPositionEx( physdev->dev.hdc, &pos ); - return add_log_points( physdev, &pos, 1, PT_MOVETO ) != NULL; + return add_points( physdev->path, &path->pos, 1, PT_MOVETO ) != NULL; +} + +/* set current position to the last point that was added to the path */ +static void update_current_pos( struct gdi_path *path ) +{ + assert( path->count ); + path->pos = path->points[path->count - 1]; } /* close the current figure */ @@ -301,6 +309,7 @@ static BOOL add_log_points_new_stroke( struct path_physdev *physdev, const POINT { if (!start_new_stroke( physdev )) return FALSE; if (!add_log_points( physdev, points, count, type )) return FALSE; + update_current_pos( physdev->path ); return TRUE; } @@ -850,6 +859,9 @@ static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) { struct path_physdev *physdev = get_path_physdev( dev ); physdev->path->newStroke = TRUE; + physdev->path->pos.x = x; + physdev->path->pos.y = y; + LPtoDP( physdev->dev.hdc, &physdev->path->pos, 1 ); return TRUE; } @@ -1077,6 +1089,9 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, /* chord: close figure. pie: add line and close figure */ switch (lines) { + case -1: + update_current_pos( physdev->path ); + break; case 1: close_figure( physdev->path ); break; @@ -1907,6 +1922,9 @@ BOOL nulldrv_BeginPath( PHYSDEV dev ) } physdev = get_path_physdev( find_dc_driver( dc, &path_driver )); physdev->path = path; + path->pos.x = dc->CursPosX; + path->pos.y = dc->CursPosY; + LPtoDP( dev->hdc, &path->pos, 1 ); if (dc->path) free_gdi_path( dc->path ); dc->path = NULL; return TRUE;

1 0

Alexandre Julliard : gdi32: Add path helper functions to add points and close figures.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 3c63993f7e3f12bff0fb7265859d534313dc0a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c63993f7e3f12bff0fb72658… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 19:55:10 2016 +0900 gdi32: Add path helper functions to add points and close figures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 147 +++++++++++++++++++++++++++++------------------------- 1 file changed, 80 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c63993f7e3f12bff0fb7…

1 0

Marcus Meissner : ole32: Allocate more for FmtIdToPropStgName (Coverity).
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 113b290dbabb7139ec6b301d2a70ddb66fb1fef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=113b290dbabb7139ec6b301d2… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 18 09:58:09 2016 +0200 ole32: Allocate more for FmtIdToPropStgName (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8e1aaef..a259883 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2178,7 +2178,7 @@ static HRESULT WINAPI IPropertySetStorage_fnCreate( IPropertyStorage** ppprstg) { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); - WCHAR name[CCH_MAX_PROPSTG_NAME]; + WCHAR name[CCH_MAX_PROPSTG_NAME + 1]; IStream *stm = NULL; HRESULT r; @@ -2236,7 +2236,7 @@ static HRESULT WINAPI IPropertySetStorage_fnOpen( { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); IStream *stm = NULL; - WCHAR name[CCH_MAX_PROPSTG_NAME]; + WCHAR name[CCH_MAX_PROPSTG_NAME + 1]; HRESULT r; TRACE("%p %s %08x %p\n", This, debugstr_guid(rfmtid), grfMode, ppprstg); @@ -2280,7 +2280,7 @@ static HRESULT WINAPI IPropertySetStorage_fnDelete( REFFMTID rfmtid) { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); - WCHAR name[CCH_MAX_PROPSTG_NAME]; + WCHAR name[CCH_MAX_PROPSTG_NAME + 1]; HRESULT r; TRACE("%p %s\n", This, debugstr_guid(rfmtid));

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
60
Older →

Jump to page:

2025

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-commits June 2016