February 2016 - Wine-commits

Józef Kucia : wined3d: Add support for separate sRGB formats.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 1769ea38e6fea924b19c2a4a4421caf4a36db844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1769ea38e6fea924b19c2a4a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 8 00:04:37 2016 +0100 wined3d: Add support for separate sRGB formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 3 +- dlls/d3d9/directx.c | 3 +- dlls/ddraw/ddraw_private.h | 3 +- dlls/wined3d/context.c | 5 ++- dlls/wined3d/device.c | 46 ++++++++++------------ dlls/wined3d/directx.c | 9 +++-- dlls/wined3d/shader.c | 16 +++----- dlls/wined3d/state.c | 12 +++--- dlls/wined3d/texture.c | 5 +-- dlls/wined3d/utils.c | 87 +++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 19 ++++++++- include/wine/wined3d.h | 1 + 12 files changed, 135 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1769ea38e6fea924b19c2…

1 0

Alistair Leslie-Hughes : gdiplus: Implement GdipSetPenTransform.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 36c068193dbc81792621dd0a5240fad43afa2979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c068193dbc81792621dd0a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 5 18:20:46 2016 +1100 gdiplus: Implement GdipSetPenTransform. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/pen.c | 6 ++++-- dlls/gdiplus/tests/pen.c | 9 ++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 47e91ec..a285bd8 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -442,9 +442,11 @@ GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) return InvalidParameter; if(!(calls++)) - FIXME("not implemented\n"); + FIXME("(%p,%p) Semi-stub\n", pen, matrix); - return NotImplemented; + pen->transform = *matrix; + + return Ok; } GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 1e63560..691386a 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -394,21 +394,20 @@ static void test_transform(void) GdipCreateMatrix2(3.0, -2.0, 5.0, 2.0, 6.0, 3.0, &matrix2); status = GdipSetPenTransform(pen, matrix2); - todo_wine expect(Ok, status); + expect(Ok, status); GdipDeleteMatrix(matrix2); status = GdipGetPenTransform(pen, matrix); expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status); -todo_wine { expectf(3.0, values[0]); expectf(-2.0, values[1]); expectf(5.0, values[2]); expectf(2.0, values[3]); expectf(6.0, values[4]); expectf(3.0, values[5]); -} + status = GdipResetPenTransform(pen); todo_wine expect(Ok, status); @@ -416,14 +415,14 @@ todo_wine { expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status); - +todo_wine { expectf(1.0, values[0]); expectf(0.0, values[1]); expectf(0.0, values[2]); expectf(1.0, values[3]); expectf(0.0, values[4]); expectf(0.0, values[5]); - +} GdipDeletePen(pen); GdipDeleteMatrix(matrix);

1 0

Alistair Leslie-Hughes : gdiplus: Implement GdipResetPenTransform.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 0f94756728591338dffa569bba9017a28386d70e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f94756728591338dffa569bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 5 18:20:47 2016 +1100 gdiplus: Implement GdipResetPenTransform. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/pen.c | 7 ++----- dlls/gdiplus/tests/pen.c | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index a285bd8..2c49371 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -419,17 +419,14 @@ GpStatus WINGDIPAPI GdipGetPenWidth(GpPen *pen, REAL *width) GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen) { - static int calls; - TRACE("(%p)\n", pen); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("(%p) stub\n", pen); + GdipSetMatrixElements(&pen->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 691386a..8591a3a 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -409,20 +409,20 @@ static void test_transform(void) expectf(3.0, values[5]); status = GdipResetPenTransform(pen); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipGetPenTransform(pen, matrix); expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status); -todo_wine { + expectf(1.0, values[0]); expectf(0.0, values[1]); expectf(0.0, values[2]); expectf(1.0, values[3]); expectf(0.0, values[4]); expectf(0.0, values[5]); -} + GdipDeletePen(pen); GdipDeleteMatrix(matrix);

1 0

Henri Verbeet : ddraw/tests: Rewrite yv12_test().
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: b2b61094e08d836021be2eab3017ac04434ad9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b61094e08d836021be2eab3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 5 21:30:59 2016 +0100 ddraw/tests: Rewrite yv12_test(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 136 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 136 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 136 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 136 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/overlay.c | 101 --------------------------------- 5 files changed, 540 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2b61094e08d836021be2…

1 0

Henri Verbeet : ddraw/tests: Rewrite offscreen_test().
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 03ef393ae40f122028264b59c1f2baaa8175b78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ef393ae40f122028264b59c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 5 21:31:00 2016 +0100 ddraw/tests: Rewrite offscreen_test(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/overlay.c | 41 ------------------------ 5 files changed, 312 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03ef393ae40f122028264…

1 0

Henri Verbeet : ddraw/tests: Rewrite rectangle_settings().
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 9628db25f6682826e472dc40e3c35bbd93db3ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9628db25f6682826e472dc40e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 5 21:31:01 2016 +0100 ddraw/tests: Rewrite rectangle_settings(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/Makefile.in | 1 - dlls/ddraw/tests/ddraw1.c | 94 ++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 94 ++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 94 ++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 94 ++++++++++++++++++++++++ dlls/ddraw/tests/overlay.c | 165 ------------------------------------------- 6 files changed, 376 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9628db25f6682826e472d…

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_get_overlay_position().
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 6e30b042e17b4a62f48ca29f26cf9e62c7fd077a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e30b042e17b4a62f48ca29f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 5 21:31:02 2016 +0100 wined3d: Introduce wined3d_texture_get_overlay_position(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 ++++--- dlls/wined3d/surface.c | 26 -------------------------- dlls/wined3d/texture.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 5 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f1ba858..d6358f8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3194,15 +3194,16 @@ static HRESULT WINAPI ddraw_surface1_GetFlipStatus(IDirectDrawSurface *iface, DW * Returns: * DDERR_NOTAOVERLAYSURFACE, because it's a stub *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetOverlayPosition(IDirectDrawSurface7 *iface, LONG *X, LONG *Y) +static HRESULT WINAPI ddraw_surface7_GetOverlayPosition(IDirectDrawSurface7 *iface, LONG *x, LONG *y) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); HRESULT hr; - TRACE("iface %p, x %p, y %p.\n", iface, X, Y); + TRACE("iface %p, x %p, y %p.\n", iface, x, y); wined3d_mutex_lock(); - hr = wined3d_surface_get_overlay_position(surface->wined3d_surface, X, Y); + hr = wined3d_texture_get_overlay_position(surface->wined3d_texture, + surface->sub_resource_idx, x, y); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2a36619..57925a6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1931,32 +1931,6 @@ HRESULT CDECL wined3d_surface_set_overlay_position(struct wined3d_surface *surfa return WINED3D_OK; } -HRESULT CDECL wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y) -{ - TRACE("surface %p, x %p, y %p.\n", surface, x, y); - - if (!(surface->resource.usage & WINED3DUSAGE_OVERLAY)) - { - TRACE("Not an overlay surface.\n"); - return WINEDDERR_NOTAOVERLAYSURFACE; - } - - if (!surface->overlay_dest) - { - TRACE("Overlay not visible.\n"); - *x = 0; - *y = 0; - return WINEDDERR_OVERLAYNOTVISIBLE; - } - - *x = surface->overlay_destrect.left; - *y = surface->overlay_destrect.top; - - TRACE("Returning position %d, %d.\n", *x, *y); - - return WINED3D_OK; -} - HRESULT CDECL wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface, DWORD flags, struct wined3d_surface *ref) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index de1d945..7c42b3c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1344,6 +1344,38 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned src_resource ? surface_from_resource(src_resource) : NULL, src_rect, flags, fx, filter); } +HRESULT CDECL wined3d_texture_get_overlay_position(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, LONG *x, LONG *y) +{ + struct wined3d_resource *sub_resource; + struct wined3d_surface *surface; + + TRACE("texture %p, sub_resource_idx %u, x %p, y %p.\n", texture, sub_resource_idx, x, y); + + if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D + || !(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + { + WARN("Invalid sub-resource specified.\n"); + return WINEDDERR_NOTAOVERLAYSURFACE; + } + + surface = surface_from_resource(sub_resource); + if (!surface->overlay_dest) + { + TRACE("Overlay not visible.\n"); + *x = 0; + *y = 0; + return WINEDDERR_OVERLAYNOTVISIBLE; + } + + *x = surface->overlay_destrect.left; + *y = surface->overlay_destrect.top; + + TRACE("Returning position %d, %d.\n", *x, *y); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 86d03f0..082a693 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -222,7 +222,6 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) -@ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @@ -255,6 +254,7 @@ @ cdecl wined3d_texture_get_dc(ptr long ptr) @ cdecl wined3d_texture_get_level_count(ptr) @ cdecl wined3d_texture_get_lod(ptr) +@ cdecl wined3d_texture_get_overlay_position(ptr long ptr ptr) @ cdecl wined3d_texture_get_parent(ptr) @ cdecl wined3d_texture_get_resource(ptr) @ cdecl wined3d_texture_get_sub_resource(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8f9d80a..36e34ea 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2474,7 +2474,6 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); -HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); @@ -2526,6 +2525,8 @@ enum wined3d_texture_filter_type __cdecl wined3d_texture_get_autogen_filter_type HRESULT __cdecl wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc); DWORD __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture); DWORD __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); +HRESULT __cdecl wined3d_texture_get_overlay_position(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, LONG *x, LONG *y); void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture); struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_texture *texture); struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(const struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_set_overlay_position().
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: ea85a1ca598228eeacc370b0d827ca9e11387dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea85a1ca598228eeacc370b0d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 5 21:31:03 2016 +0100 wined3d: Introduce wined3d_texture_set_overlay_position(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 ++++--- dlls/wined3d/surface.c | 22 ---------------------- dlls/wined3d/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 5 +++-- 5 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d6358f8..e918f25 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3625,15 +3625,16 @@ static HRESULT WINAPI ddraw_surface1_Restore(IDirectDrawSurface *iface) * Returns: * DDERR_NOTAOVERLAYSURFACE, because we don't support overlays right now *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_SetOverlayPosition(IDirectDrawSurface7 *iface, LONG X, LONG Y) +static HRESULT WINAPI ddraw_surface7_SetOverlayPosition(IDirectDrawSurface7 *iface, LONG x, LONG y) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); HRESULT hr; - TRACE("iface %p, x %d, y %d.\n", iface, X, Y); + TRACE("iface %p, x %d, y %d.\n", iface, x, y); wined3d_mutex_lock(); - hr = wined3d_surface_set_overlay_position(surface->wined3d_surface, X, Y); + hr = wined3d_texture_set_overlay_position(surface->wined3d_texture, + surface->sub_resource_idx, x, y); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 57925a6..e36e353 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1909,28 +1909,6 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) return pitch; } -HRESULT CDECL wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y) -{ - LONG w, h; - - TRACE("surface %p, x %d, y %d.\n", surface, x, y); - - if (!(surface->resource.usage & WINED3DUSAGE_OVERLAY)) - { - WARN("Not an overlay surface.\n"); - return WINEDDERR_NOTAOVERLAYSURFACE; - } - - w = surface->overlay_destrect.right - surface->overlay_destrect.left; - h = surface->overlay_destrect.bottom - surface->overlay_destrect.top; - surface->overlay_destrect.left = x; - surface->overlay_destrect.top = y; - surface->overlay_destrect.right = x + w; - surface->overlay_destrect.bottom = y + h; - - return WINED3D_OK; -} - HRESULT CDECL wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface, DWORD flags, struct wined3d_surface *ref) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7c42b3c..297ab27 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1376,6 +1376,33 @@ HRESULT CDECL wined3d_texture_get_overlay_position(const struct wined3d_texture return WINED3D_OK; } +HRESULT CDECL wined3d_texture_set_overlay_position(struct wined3d_texture *texture, + unsigned int sub_resource_idx, LONG x, LONG y) +{ + struct wined3d_resource *sub_resource; + struct wined3d_surface *surface; + LONG w, h; + + TRACE("texture %p, sub_resource_idx %u, x %d, y %d.\n", texture, sub_resource_idx, x, y); + + if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D + || !(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + { + WARN("Invalid sub-resource specified.\n"); + return WINEDDERR_NOTAOVERLAYSURFACE; + } + + surface = surface_from_resource(sub_resource); + w = surface->overlay_destrect.right - surface->overlay_destrect.left; + h = surface->overlay_destrect.bottom - surface->overlay_destrect.top; + surface->overlay_destrect.left = x; + surface->overlay_destrect.top = y; + surface->overlay_destrect.right = x + w; + surface->overlay_destrect.bottom = y + h; + + return WINED3D_OK; +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 082a693..4ec8336 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -224,7 +224,6 @@ @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) -@ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr) @@ -264,6 +263,7 @@ @ cdecl wined3d_texture_set_autogen_filter_type(ptr long) @ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) +@ cdecl wined3d_texture_set_overlay_position(ptr long long long) @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) @ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 36e34ea..b43b31d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2476,7 +2476,6 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx); HRESULT __cdecl wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface, @@ -2533,12 +2532,14 @@ struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(const struct UINT sub_resource_idx); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); void __cdecl wined3d_texture_preload(struct wined3d_texture *texture); +HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); HRESULT __cdecl wined3d_texture_set_autogen_filter_type(struct wined3d_texture *texture, enum wined3d_texture_filter_type filter_type); HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, DWORD flags, const struct wined3d_color_key *color_key); DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); -HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); +HRESULT __cdecl wined3d_texture_set_overlay_position(struct wined3d_texture *texture, + unsigned int sub_resource_idx, LONG x, LONG y); HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality,

1 0

Nikolay Sivov : ntdll: Remove redundant NULL check (Coverity).
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: ce093a2acf18ae7bb9f391f7689b2f9399791dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce093a2acf18ae7bb9f391f76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 6 03:02:06 2016 +0300 ntdll: Remove redundant NULL check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index c88221e..e87e672 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -806,7 +806,7 @@ NTSTATUS WINAPI NtOpenTimer( HANDLE *handle, ACCESS_MASK access, const OBJECT_AT { req->access = access; req->attributes = attr->Attributes; - req->rootdir = wine_server_obj_handle( attr ? attr->RootDirectory : 0 ); + req->rootdir = wine_server_obj_handle( attr->RootDirectory ); if (attr->ObjectName) wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); status = wine_server_call( req );

1 0

Marcus Meissner : ntdll: Cast left shifted 1 to be ulong wide (Coverity).
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: de853e2b65e54593e247c1eeac50738078abd386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de853e2b65e54593e247c1eea… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 6 15:30:59 2016 +0100 ntdll: Cast left shifted 1 to be ulong wide (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 9b750e4..5c8b7fd 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1520,7 +1520,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** fclose(f); } else r = 0; - if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorPackage, r, 1 << i)) + if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorPackage, r, (ULONG_PTR)1 << i)) { fclose(fcpu_list); return STATUS_NO_MEMORY; @@ -1534,7 +1534,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** fclose(f); } else r = i; - if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, r, 1 << i)) + if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, r, (ULONG_PTR)1 << i)) { fclose(fcpu_list); return STATUS_NO_MEMORY;

1 0