wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Vincent Povirk : gdiplus: Implement GdipSetPathGradientSigmaBlend.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 8273d58a9619fd7a0d3640ad07b402fcd3bc0d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8273d58a9619fd7a0d3640ad0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 09:55:29 2012 -0500 gdiplus: Implement GdipSetPathGradientSigmaBlend. --- dlls/gdiplus/brush.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 490a0b9..a2cf1f9 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1642,17 +1642,57 @@ GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient *grad, GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, REAL focus, REAL scale) { - static int calls; + REAL factors[33]; + REAL positions[33]; + int num_points = 0; + int i; + const int precision = 16; + REAL erf_range; /* we use values erf(-erf_range) through erf(+erf_range) */ + REAL min_erf; + REAL scale_erf; TRACE("(%p,%0.2f,%0.2f)\n", grad, focus, scale); if(!grad || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + /* we want 2 standard deviations */ + erf_range = 2.0 / sqrt(2); - return NotImplemented; + /* calculate the constants we need to normalize the error function to be + between 0.0 and scale over the range we need */ + min_erf = erf(-erf_range); + scale_erf = scale / (-2.0 * min_erf); + + if (focus != 0.0) + { + positions[0] = 0.0; + factors[0] = 0.0; + for (i=1; i<precision; i++) + { + positions[i] = focus * i / precision; + factors[i] = scale_erf * (erf(2 * erf_range * i / precision - erf_range) - min_erf); + } + num_points += precision; + } + + positions[num_points] = focus; + factors[num_points] = scale; + num_points += 1; + + if (focus != 1.0) + { + for (i=1; i<precision; i++) + { + positions[i+num_points-1] = (focus + ((1.0-focus) * i / precision)); + factors[i+num_points-1] = scale_erf * (erf(erf_range - 2 * erf_range * i / precision) - min_erf); + } + num_points += precision; + positions[num_points-1] = 1.0; + factors[num_points-1] = 0.0; + } + + return GdipSetPathGradientBlend(grad, factors, positions, num_points); } GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient

1 0

Vincent Povirk : gdiplus: Implement GdipSetPathGradientLinearBlend.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: d0a85604d532bb8f4cc3cd1a07ce525facb0dc65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a85604d532bb8f4cc3cd1a0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 09:50:33 2012 -0500 gdiplus: Implement GdipSetPathGradientLinearBlend. --- dlls/gdiplus/brush.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 5c82064..490a0b9 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1466,14 +1466,33 @@ GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient *brush, GDIPCONST RE GpStatus WINGDIPAPI GdipSetPathGradientLinearBlend(GpPathGradient *brush, REAL focus, REAL scale) { - static int calls; + REAL factors[3]; + REAL positions[3]; + int num_points = 0; TRACE("(%p,%0.2f,%0.2f)\n", brush, focus, scale); - if(!(calls++)) - FIXME("not implemented\n"); + if (!brush) return InvalidParameter; - return NotImplemented; + if (focus != 0.0) + { + factors[num_points] = 0.0; + positions[num_points] = 0.0; + num_points++; + } + + factors[num_points] = scale; + positions[num_points] = focus; + num_points++; + + if (focus != 1.0) + { + factors[num_points] = 0.0; + positions[num_points] = 1.0; + num_points++; + } + + return GdipSetPathGradientBlend(brush, factors, positions, num_points); } GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient *brush,

1 0

Vincent Povirk : gdiplus: Implement GdipSetPathGradientBlend, with tests.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: b66fd44080b3a78d68f5dbe73005141b3f71bc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66fd44080b3a78d68f5dbe73… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 09:44:43 2012 -0500 gdiplus: Implement GdipSetPathGradientBlend, with tests. --- dlls/gdiplus/brush.c | 29 ++++++++++-- dlls/gdiplus/tests/brush.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index b05d74a..5c82064 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1432,14 +1432,35 @@ GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient *line, GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient *brush, GDIPCONST REAL *blend, GDIPCONST REAL *pos, INT count) { - static int calls; + REAL *new_blendfac, *new_blendpos; TRACE("(%p,%p,%p,%i)\n", brush, blend, pos, count); - if(!(calls++)) - FIXME("not implemented\n"); + if(!brush || !blend || !pos || count <= 0 || + (count >= 2 && (pos[0] != 0.0f || pos[count-1] != 1.0f))) + return InvalidParameter; - return NotImplemented; + new_blendfac = GdipAlloc(count * sizeof(REAL)); + new_blendpos = GdipAlloc(count * sizeof(REAL)); + + if (!new_blendfac || !new_blendpos) + { + GdipFree(new_blendfac); + GdipFree(new_blendpos); + return OutOfMemory; + } + + memcpy(new_blendfac, blend, count * sizeof(REAL)); + memcpy(new_blendpos, pos, count * sizeof(REAL)); + + GdipFree(brush->blendfac); + GdipFree(brush->blendpos); + + brush->blendcount = count; + brush->blendfac = new_blendfac; + brush->blendpos = new_blendpos; + + return Ok; } GpStatus WINGDIPAPI GdipSetPathGradientLinearBlend(GpPathGradient *brush, diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index bf74abd..354d60d 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1133,6 +1133,110 @@ static void test_pathgradientpresetblend(void) expect(Ok, status); } +static void test_pathgradientblend(void) +{ + static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; + GpPathGradient *brush; + GpStatus status; + INT count, i; + const REAL factors[5] = {0.0f, 0.1f, 0.5f, 0.9f, 1.0f}; + const REAL positions[5] = {0.0f, 0.2f, 0.5f, 0.8f, 1.0f}; + REAL res_factors[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + + status = GdipCreatePathGradient(path_points, 3, WrapModeClamp, &brush); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlendCount(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetPathGradientBlend(NULL, res_factors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, NULL, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, NULL, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, -1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 2); + expect(Ok, status); + + status = GdipSetPathGradientBlend(NULL, factors, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, NULL, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, NULL, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 0); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, -1); + expect(InvalidParameter, status); + + /* leave off the 0.0 position */ + status = GdipSetPathGradientBlend(brush, &factors[1], &positions[1], 4); + expect(InvalidParameter, status); + + /* leave off the 1.0 position */ + status = GdipSetPathGradientBlend(brush, factors, positions, 4); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 5); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(5, count); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 4); + expect(InsufficientBuffer, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 5); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expectf(factors[i], res_factors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 6); + expect(Ok, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 1); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1160,6 +1264,7 @@ START_TEST(brush) test_pathgradientpath(); test_pathgradientcenterpoint(); test_pathgradientpresetblend(); + test_pathgradientblend(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Remove FIXME on implemented function.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 4a78d7c6b4087317d3d29e311ae9af7f5d6b828c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a78d7c6b4087317d3d29e311… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 09:17:42 2012 -0500 gdiplus: Remove FIXME on implemented function. --- dlls/gdiplus/brush.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ac5328e..b05d74a 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1520,7 +1520,7 @@ GpStatus WINGDIPAPI GdipGetPathGradientPresetBlend(GpPathGradient *brush, GpStatus WINGDIPAPI GdipGetPathGradientPresetBlendCount(GpPathGradient *brush, INT *count) { - FIXME("(%p,%p): stub\n", brush, count); + TRACE("(%p,%p)\n", brush, count); if (!brush || !count) return InvalidParameter;

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DBaseTexture9Impl.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: d01e0647d14a79b4a9ce78200eb737d62f9ce298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01e0647d14a79b4a9ce78200… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:15 2012 +0200 d3d9: Get rid of IDirect3DBaseTexture9Impl. --- dlls/d3d9/d3d9_private.h | 15 +-------------- dlls/d3d9/device.c | 12 +++++++++--- dlls/d3d9/texture.c | 10 ++++++++++ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 2b5a5c7..d814dd0 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -289,20 +289,6 @@ HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; IDirect3DIndexBuffer9Impl *unsafe_impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) DECLSPEC_HIDDEN; -/* --------------------- */ -/* IDirect3DBaseTexture9 */ -/* --------------------- */ - -/***************************************************************************** - * IDirect3DBaseTexture9 implementation structure - */ -typedef struct IDirect3DBaseTexture9Impl -{ - const IDirect3DBaseTexture9Vtbl *lpVtbl; - LONG ref; - struct wined3d_texture *wined3d_texture; -} IDirect3DBaseTexture9Impl; - struct d3d9_texture { IDirect3DBaseTexture9 IDirect3DBaseTexture9_iface; @@ -317,6 +303,7 @@ HRESULT texture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *device, UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; HRESULT volumetexture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *device, UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; +struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture9 *iface) DECLSPEC_HIDDEN; /* ----------------------- */ /* IDirect3DStateBlock9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 20635a0..943c608 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -975,14 +975,17 @@ static HRESULT WINAPI IDirect3DDevice9Impl_UpdateTexture(IDirect3DDevice9Ex *ifa IDirect3DBaseTexture9 *src_texture, IDirect3DBaseTexture9 *dst_texture) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + struct d3d9_texture *src_impl, *dst_impl; HRESULT hr; TRACE("iface %p, src_texture %p, dst_texture %p.\n", iface, src_texture, dst_texture); + src_impl = unsafe_impl_from_IDirect3DBaseTexture9(src_texture); + dst_impl = unsafe_impl_from_IDirect3DBaseTexture9(dst_texture); + wined3d_mutex_lock(); hr = wined3d_device_update_texture(This->wined3d_device, - ((IDirect3DBaseTexture9Impl *)src_texture)->wined3d_texture, - ((IDirect3DBaseTexture9Impl *)dst_texture)->wined3d_texture); + src_impl->wined3d_texture, dst_impl->wined3d_texture); wined3d_mutex_unlock(); return hr; @@ -1717,13 +1720,16 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetTexture(IDirect3DDevice9Ex *iface, IDirect3DBaseTexture9 *texture) { IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); + struct d3d9_texture *texture_impl; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); + texture_impl = unsafe_impl_from_IDirect3DBaseTexture9(texture); + wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, - texture ? ((IDirect3DBaseTexture9Impl *)texture)->wined3d_texture : NULL); + texture_impl ? texture_impl->wined3d_texture : NULL); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 3c08cc3..7891596 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1243,6 +1243,16 @@ static const IDirect3DVolumeTexture9Vtbl d3d9_texture_3d_vtbl = d3d9_texture_3d_AddDirtyBox, }; +struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture9 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl + || iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl + || iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl); + return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface); +} + static void STDMETHODCALLTYPE d3d9_texture_wined3d_object_destroyed(void *parent) { HeapFree(GetProcessHeap(), 0, parent);

1 0

Henri Verbeet : d3d9: Merge volumetexture.c into texture.c.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 5145b131998276e8d837df1e6d7ba5ef5aafdd57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5145b131998276e8d837df1e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:14 2012 +0200 d3d9: Merge volumetexture.c into texture.c. --- dlls/d3d9/Makefile.in | 3 +- dlls/d3d9/texture.c | 419 +++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/volumetexture.c | 454 --------------------------------------------- 3 files changed, 420 insertions(+), 456 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5145b131998276e8d837d…

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetBackBuffer ().
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: fb5bc7240860fb5e603616be969729ef355e81f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5bc7240860fb5e603616be9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:13 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetBackBuffer(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ddfaae6..20635a0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -596,6 +596,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(IDirect3DDevice9Ex *ifa { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_surface *wined3d_surface = NULL; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, swapchain %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", @@ -606,7 +607,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(IDirect3DDevice9Ex *ifa BackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface && ppBackBuffer) { - *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppBackBuffer = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*ppBackBuffer); wined3d_surface_decref(wined3d_surface); }

1 0

Henri Verbeet : d3d9: Use the surface implementation pointer in reset_enum_callback().
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 138edd31e596a14ba69f8c53b05cada71ea0143b URL: http://source.winehq.org/git/wine.git/?a=commit;h=138edd31e596a14ba69f8c53b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:12 2012 +0200 d3d9: Use the surface implementation pointer in reset_enum_callback(). --- dlls/d3d9/device.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7fd300fb..ddfaae6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -507,7 +507,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) wined3d_resource_get_desc(resource, &desc); if (desc.pool == WINED3D_POOL_DEFAULT) { - IDirect3DSurface9 *surface; + IDirect3DSurface9Impl *surface; if (desc.resource_type != WINED3D_RTYPE_SURFACE) { @@ -516,9 +516,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) } surface = wined3d_resource_get_parent(resource); - - IDirect3DSurface9_AddRef(surface); - if (IDirect3DSurface9_Release(surface)) + if (surface->ref) { WARN("Surface %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface, resource); return D3DERR_INVALIDCALL;

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetSwapChain ().
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 11a2231c11b2deeaec6c65a1c2fbb92558348e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a2231c11b2deeaec6c65a1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:11 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetSwapChain(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 602baac..7fd300fb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -463,6 +463,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(IDirec { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_swapchain *wined3d_swapchain = NULL; + IDirect3DSwapChain9Impl *swapchain_impl; HRESULT hr; TRACE("iface %p, swapchain_idx %u, swapchain %p.\n", iface, swapchain_idx, swapchain); @@ -471,7 +472,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(IDirec hr = wined3d_device_get_swapchain(This->wined3d_device, swapchain_idx, &wined3d_swapchain); if (SUCCEEDED(hr) && wined3d_swapchain) { - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + swapchain_impl = wined3d_swapchain_get_parent(wined3d_swapchain); + *swapchain = &swapchain_impl->IDirect3DSwapChain9_iface; IDirect3DSwapChain9_AddRef(*swapchain); wined3d_swapchain_decref(wined3d_swapchain); }

1 0

Aric Stewart : strmbase: get_VideoHeight should always have a positive height.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 6b9cfd2629767ba9e99eb8547258bea73c539a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9cfd2629767ba9e99eb8547… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 24 13:47:08 2012 -0500 strmbase: get_VideoHeight should always have a positive height. --- dlls/strmbase/video.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 83cd37f..1c4f360 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -156,7 +156,7 @@ HRESULT WINAPI BaseControlVideoImpl_get_VideoHeight(IBasicVideo *iface, LONG *pV TRACE("(%p/%p)->(%p)\n", This, iface, pVideoHeight); vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pVideoHeight = vih->bmiHeader.biHeight; + *pVideoHeight = abs(vih->bmiHeader.biHeight); return S_OK; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
72
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 April 2012