July 2016 - Wine-Commits - list.winehq.org

Matteo Bruni : d3dx9_42: Drop D3DXGatherFragments* exports.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 002daaaddd1cfb74a387df303f09695d4fb4276f URL: http://source.winehq.org/git/wine.git/?a=commit;h=002daaaddd1cfb74a387df303… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 28 19:06:02 2016 +0200 d3dx9_42: Drop D3DXGatherFragments* exports. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_42/d3dx9_42.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index fbd302e..400461b 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -138,11 +138,6 @@ @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) @ stdcall D3DXFVFFromDeclarator(ptr ptr) -@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) -@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) -@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) -@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) -@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) @ stub D3DXGenerateOutputDecl(ptr ptr) @ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr)

1 0

Alistair Leslie-Hughes : d3dx9_41: Share the source with d3dx9_36.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: ab2ef2dd3c450eb06d7bf5263720ba56feda2cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2ef2dd3c450eb06d7bf5263… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 28 19:01:46 2016 +0200 d3dx9_41: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_41/Makefile.in | 22 +- dlls/d3dx9_41/d3dx9_41.spec | 670 +++++++++++++++++++++--------------------- dlls/d3dx9_41/d3dx9_41_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 356 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab2ef2dd3c450eb06d7bf…

1 0

Alistair Leslie-Hughes : d3dx9_40: Share the source with d3dx9_36.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 4e518bd4e10f464ef737c4bbdc2170a069a12033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e518bd4e10f464ef737c4bbd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:01:08 2016 +0000 d3dx9_40: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_40/Makefile.in | 22 +- dlls/d3dx9_40/d3dx9_40.spec | 670 +++++++++++++++++++++--------------------- dlls/d3dx9_40/d3dx9_40_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 356 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e518bd4e10f464ef737c…

1 0

Alistair Leslie-Hughes : d3dx9_43: Share the source with d3dx9_36.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: dfe3f26b6ddd5f280f61e15a8507e727947b99a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe3f26b6ddd5f280f61e15a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:01:50 2016 +0000 d3dx9_43: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_43/Makefile.in | 22 +- dlls/d3dx9_43/d3dx9_43.spec | 656 +++++++++++++++++++++--------------------- dlls/d3dx9_43/d3dx9_43_main.c | 2 +- tools/make_specfiles | 4 - 4 files changed, 349 insertions(+), 335 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfe3f26b6ddd5f280f61e…

1 0

Alistair Leslie-Hughes : d3dx9_39: Share the source with d3dx9_36.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: beccd5a2e53927137de031c1976e66d35b08afeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=beccd5a2e53927137de031c19… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:00:55 2016 +0000 d3dx9_39: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_39/Makefile.in | 22 +- dlls/d3dx9_39/d3dx9_39.spec | 670 +++++++++++++++++++++--------------------- dlls/d3dx9_39/d3dx9_39_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 356 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=beccd5a2e53927137de03…

1 0

Alistair Leslie-Hughes : d3dx9_38: Share the source with d3dx9_36.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 583ad6a1a23b4bb8c826502fb782779a2cb1a7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=583ad6a1a23b4bb8c826502fb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:00:42 2016 +0000 d3dx9_38: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_38/Makefile.in | 22 +- dlls/d3dx9_38/d3dx9_38.spec | 670 +++++++++++++++++++++--------------------- dlls/d3dx9_38/d3dx9_38_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 356 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=583ad6a1a23b4bb8c8265…

1 0

Aaryaman Vasishta : d3drm: Use a table in d3drm3_CreateObject() to create objects in a generic manner.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 94bab100a4fe6b99c5accdf161f638d1f2419903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bab100a4fe6b99c5accdf16… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Jun 29 15:39:01 2016 +0200 d3drm: Use a table in d3drm3_CreateObject() to create objects in a generic manner. 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 | 40 +++++++++++++++++++++++++++++++++------- dlls/d3drm/d3drm_private.h | 4 ++++ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8d054b5..7fcb0ba 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -51,6 +51,19 @@ static const char* get_IID_string(const GUID* guid) return "?"; } +static HRESULT d3drm_create_texture_object(void **object, IDirect3DRM *d3drm) +{ + struct d3drm_texture *texture; + HRESULT hr; + + if (FAILED(hr = d3drm_texture_create(&texture, d3drm))) + return hr; + + *object = &texture->IDirect3DRMTexture_iface; + + return hr; +} + struct d3drm { IDirect3DRM IDirect3DRM_iface; @@ -1106,8 +1119,19 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, { struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); IUnknown *object; + unsigned int i; HRESULT hr; + static const struct + { + const CLSID *clsid; + HRESULT (*create_object)(void **object, IDirect3DRM *d3drm); + } + object_table[] = + { + {&CLSID_CDirect3DRMTexture, d3drm_create_texture_object}, + }; + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); @@ -1127,17 +1151,19 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, return E_NOTIMPL; } - if (IsEqualGUID(clsid, &CLSID_CDirect3DRMTexture)) + for (i = 0; i < ARRAY_SIZE(object_table); ++i) { - struct d3drm_texture *texture; - if (FAILED(hr = d3drm_texture_create(&texture, &d3drm->IDirect3DRM_iface))) + if (IsEqualGUID(clsid, object_table[i].clsid)) { - *out = NULL; - return hr; + if (FAILED(hr = object_table[i].create_object((void **)&object, &d3drm->IDirect3DRM_iface))) + { + *out = NULL; + return hr; + } + break; } - object = (IUnknown *)&texture->IDirect3DRMTexture3_iface; } - else + if (i == ARRAY_SIZE(object_table)) { FIXME("%s not implemented. Returning CLASSFACTORY_E_FIRST.\n", debugstr_guid(clsid)); *out = NULL; diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 06cbdc1..651eaec 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -26,6 +26,10 @@ #include "wine/list.h" +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) +#endif + struct d3drm_device; struct d3drm_object {

1 0

Michael Stefaniuc : wined3d: Use SetRect() instead of open coding it.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: bb82e915d14df26e2068cfc545d3113b815695dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb82e915d14df26e2068cfc54… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:58:26 2016 +0200 wined3d: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0df7023..7485c1c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -678,10 +678,8 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai TRACE("offset %s.\n", wine_dbgstr_point(&offset)); - draw_rect.left = 0; - draw_rect.right = swapchain->front_buffer->resource.width; - draw_rect.top = 0; - draw_rect.bottom = swapchain->front_buffer->resource.height; + SetRect(&draw_rect, 0, 0, swapchain->front_buffer->resource.width, + swapchain->front_buffer->resource.height); IntersectRect(&draw_rect, &draw_rect, &swapchain->front_buffer_update); BitBlt(dst_dc, draw_rect.left - offset.x, draw_rect.top - offset.y,

1 0

Alistair Leslie-Hughes : d3dx9_42: Share the source with d3dx9_36.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 1b9f5c34b5501441c909c505542c651be1bc8872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9f5c34b5501441c909c5055… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 22 06:01:37 2016 +0000 d3dx9_42: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_42/Makefile.in | 22 +- dlls/d3dx9_42/d3dx9_42.spec | 666 +++++++++++++++++++++--------------------- dlls/d3dx9_42/d3dx9_42_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 354 insertions(+), 337 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b9f5c34b5501441c909c…

1 0

Michael Stefaniuc : strmbase: Use SetRect() instead of open coding it.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 275eb8ab2bfbf6ff1e2759b5e4c87e071174f802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275eb8ab2bfbf6ff1e2759b5e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:55:24 2016 +0200 strmbase: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/video.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 9714d7e..ec3a076 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -368,10 +368,8 @@ HRESULT WINAPI BaseControlVideoImpl_SetSourcePosition(IBasicVideo *iface, LONG L BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); - SourceRect.left = Left; - SourceRect.top = Top; - SourceRect.right = Left + Width; - SourceRect.bottom = Top + Height; + + SetRect(&SourceRect, Left, Top, Left + Width, Top + Height); This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); return S_OK; @@ -408,10 +406,7 @@ HRESULT WINAPI BaseControlVideoImpl_SetDestinationPosition(IBasicVideo *iface, L TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); - DestRect.left = Left; - DestRect.top = Top; - DestRect.right = Left + Width; - DestRect.bottom = Top + Height; + SetRect(&DestRect, Left, Top, Left + Width, Top + Height); This->pFuncsTable->pfnSetTargetRect(This, &DestRect); return S_OK;

1 0