February 2016 - Wine-Commits

Alexandre Julliard : server: Add a function to lookup an object by name inside any parent, not only directories.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: bfd0dff215a954dace516b74430c55c6cb7abeba URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd0dff215a954dace516b744… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 14:09:36 2016 +0900 server: Add a function to lookup an object by name inside any parent, not only directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 55 ++++++------------------------------------------------ server/object.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ server/object.h | 3 +++ 3 files changed, 59 insertions(+), 49 deletions(-) diff --git a/server/directory.c b/server/directory.c index 45683b9..cba3a35 100644 --- a/server/directory.c +++ b/server/directory.c @@ -218,6 +218,11 @@ static struct directory *create_directory( struct directory *root, const struct return dir; } +struct object *get_root_directory(void) +{ + return grab_object( root_directory ); +} + struct directory *get_directory_obj( struct process *process, obj_handle_t handle, unsigned int access ) { return (struct directory *)get_handle_obj( process, handle, access, &directory_ops ); @@ -242,55 +247,7 @@ struct directory *get_directory_obj( struct process *process, obj_handle_t handl struct object *find_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attr, struct unicode_str *name_left ) { - struct object *obj, *parent; - struct unicode_str name_tmp; - - if (name) name_tmp = *name; - else name_tmp.len = 0; - - /* Arguments check: - * - Either rootdir or name have to be specified - * - If root is specified path shouldn't start with backslash */ - if (root) - { - if (name_tmp.len && name_tmp.str[0] == '\\') - { - set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); - return NULL; - } - parent = grab_object( root ); - } - else - { - if (!name_tmp.len || name_tmp.str[0] != '\\') - { - set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); - return NULL; - } - parent = grab_object( &root_directory->obj ); - /* skip leading backslash */ - name_tmp.str++; - name_tmp.len -= sizeof(WCHAR); - } - - /* Special case for opening RootDirectory */ - if (!name_tmp.len) goto done; - - while ((obj = parent->ops->lookup_name( parent, &name_tmp, attr ))) - { - /* move to the next element */ - release_object ( parent ); - parent = obj; - } - if (get_error()) - { - release_object( parent ); - return NULL; - } - - done: - if (name_left) *name_left = name_tmp; - return parent; + return lookup_named_object( &root->obj, name, attr, name_left ); } /* create a named (if name is present) or unnamed object. */ diff --git a/server/object.c b/server/object.c index c8098ca..297a5b3 100644 --- a/server/object.c +++ b/server/object.c @@ -211,6 +211,56 @@ void free_object( struct object *obj ) free( obj ); } +/* find an object by name starting from the specified root */ +/* if it doesn't exist, its parent is returned, and name_left contains the remaining name */ +struct object *lookup_named_object( struct object *root, const struct unicode_str *name, + unsigned int attr, struct unicode_str *name_left ) +{ + struct object *obj, *parent; + struct unicode_str name_tmp = *name; + + if (root) + { + /* if root is specified path shouldn't start with backslash */ + if (name_tmp.len && name_tmp.str[0] == '\\') + { + set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); + return NULL; + } + parent = grab_object( root ); + } + else + { + if (!name_tmp.len || name_tmp.str[0] != '\\') + { + set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); + return NULL; + } + /* skip leading backslash */ + name_tmp.str++; + name_tmp.len -= sizeof(WCHAR); + parent = get_root_directory(); + } + + if (!name_tmp.len) goto done; + + while ((obj = parent->ops->lookup_name( parent, &name_tmp, attr ))) + { + /* move to the next element */ + release_object ( parent ); + parent = obj; + } + if (get_error()) + { + release_object( parent ); + return NULL; + } + + done: + if (name_left) *name_left = name_tmp; + return parent; +} + void *create_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name ) { struct object *obj; diff --git a/server/object.h b/server/object.h index c4bc40b..90112d7 100644 --- a/server/object.h +++ b/server/object.h @@ -132,6 +132,8 @@ extern void namespace_add( struct namespace *namespace, struct object_name *ptr extern const WCHAR *get_object_name( struct object *obj, data_size_t *len ); extern WCHAR *get_object_full_name( struct object *obj, data_size_t *ret_len ); extern void dump_object_name( struct object *obj ); +extern struct object *lookup_named_object( struct object *root, const struct unicode_str *name, + unsigned int attr, struct unicode_str *name_left ); extern void *create_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name ); extern void *create_named_object( struct object *parent, struct namespace *namespace, const struct object_ops *ops, @@ -225,6 +227,7 @@ extern void release_global_atom( struct winstation *winstation, atom_t atom ); /* directory functions */ +extern struct object *get_root_directory(void); extern struct directory *get_directory_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct object *find_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attr, struct unicode_str *name_left );

1 0

Henri Verbeet : ddraw/tests: Rewrite yv12_test().
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

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

Alistair Leslie-Hughes : gdiplus: Implement GdipResetPenTransform.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

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 : wined3d: Introduce wined3d_texture_set_overlay_position().
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

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

Henri Verbeet : wined3d: Introduce wined3d_texture_get_overlay_position().
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

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 : ddraw/tests: Rewrite rectangle_settings().
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

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

Alexandre Julliard : server: Use the generic named object functions for mailslots.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: 4e380b9e2b6d74cfb19586276426ca914d253499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e380b9e2b6d74cfb19586276… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 14:28:54 2016 +0900 server: Use the generic named object functions for mailslots. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mailslot.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/server/mailslot.c b/server/mailslot.c index a0fa6e2..eb3c0a6 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -418,41 +418,10 @@ static struct mailslot *create_mailslot( struct directory *root, int max_msgsize, timeout_t read_timeout, const struct security_descriptor *sd ) { - struct object *obj; - struct unicode_str new_name; struct mailslot *mailslot; int fds[2]; - if (!name || !name->len) - { - mailslot = alloc_object( &mailslot_ops ); - goto init; - } - - if (!(obj = find_object_dir( root, name, attr, &new_name ))) - { - set_error( STATUS_OBJECT_NAME_INVALID ); - return NULL; - } - - if (!new_name.len) - { - if (attr & OBJ_OPENIF && obj->ops == &mailslot_ops) - /* it already exists - there can only be one mailslot to read from */ - set_error( STATUS_OBJECT_NAME_EXISTS ); - else if (attr & OBJ_OPENIF) - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - else - set_error( STATUS_OBJECT_NAME_COLLISION ); - release_object( obj ); - return NULL; - } - - mailslot = create_object( obj, &mailslot_ops, &new_name ); - release_object( obj ); - -init: - if (!mailslot) return NULL; + if (!(mailslot = create_named_object_dir( root, name, attr, &mailslot_ops ))) return NULL; mailslot->fd = NULL; mailslot->write_fd = -1;

1 0

Nikolay Sivov : ntdll: Remove redundant NULL check (Coverity).
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

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

Frédéric Delanoy : French translation for release 1.9.3
by Jeremy Newman Feb. 5, 2016

Feb. 5, 2016

Module: website Branch: master Commit: 5a1364a49ba9ab74294d1c2ce78279c9eef3565c URL: http://source.winehq.org/git/website.git/?a=commit;h=5a1364a49ba9ab74294d1c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 5 17:04:57 2016 +0100 French translation for release 1.9.3 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016020501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2016020501.xml b/news/fr/2016020501.xml new file mode 100644 index 0000000..0c5fa96 --- /dev/null +++ b/news/fr/2016020501.xml @@ -0,0 +1,16 @@ +<news> +<date>5 février 2016</date> +<title>Sortie de Wine 1.9.3</title> +<body> +La version de développement 1.9.3 de Wine est disponible. +<a href="{$root}/announce/1.9.3">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle version du moteur Gecko basée sur Firefox 44.</li> + <li>Prise en charge de JSON dans JavaScript.</li> + <li>Meilleure prise en charge du retour à la ligne automatique dans DirectWrite.</li> + <li>Prise en charge améliorée de l'écriture dans WebServices.</li> + <li>Encore plus d'instructions Shader Model 4.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.3.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.8.1
by Jeremy Newman Feb. 5, 2016

Feb. 5, 2016

Module: website Branch: master Commit: af1f8177d828a6785a9fd1ffd4e6ec830091aeb2 URL: http://source.winehq.org/git/website.git/?a=commit;h=af1f8177d828a6785a9fd1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 5 17:04:56 2016 +0100 French translation for release 1.8.1 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016020301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/fr/2016020301.xml b/news/fr/2016020301.xml new file mode 100644 index 0000000..c344fc6 --- /dev/null +++ b/news/fr/2016020301.xml @@ -0,0 +1,12 @@ +<news> +<date>3 février 2016</date> +<title>Sortie de Wine 1.8.1</title> +<body> + La version de maintenance 1.8.1 est disponible. + <a href="{$root}/announce/1.8.1">Nouveautés</a> de cette version : +<ul> + <li>Diverses corrections de bugs.</li> + <li>Petites mises à jour de traductions.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.1.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0