February 2016 - Wine-Commits

Alexandre Julliard : make_unicode: Fix typo in Indic syllable table generation.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: cb65a3fbf995870bb97c442fd7bcce02d5b6607a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb65a3fbf995870bb97c442fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 13:58:53 2016 +0900 make_unicode: Fix typo in Indic syllable table generation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/indicsyllable.c | 212 +++++++++++++++++++++++++-------------------- tools/make_unicode | 2 +- 2 files changed, 118 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb65a3fbf995870bb97c4…

1 0

Alexandre Julliard : server: Remove some no longer used directory functions.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: b548f8c4a7b5bb82d6e1206939f638153aedce36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b548f8c4a7b5bb82d6e120693… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:23:40 2016 +0900 server: Remove some no longer used directory functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 29 ----------------------------- server/object.h | 4 ---- 2 files changed, 33 deletions(-) diff --git a/server/directory.c b/server/directory.c index 67d8089..6a5af9a 100644 --- a/server/directory.c +++ b/server/directory.c @@ -228,28 +228,6 @@ struct directory *get_directory_obj( struct process *process, obj_handle_t handl return (struct directory *)get_handle_obj( process, handle, access, &directory_ops ); } -/****************************************************************************** - * Find an object by its name in a given root object - * - * PARAMS - * root [I] directory to start search from or NULL to start from \\ - * name [I] object name to search for - * attr [I] OBJECT_ATTRIBUTES.Attributes - * name_left [O] [optional] leftover name if object is not found - * - * RETURNS - * NULL: If params are invalid - * Found: If object with exact name is found returns that object - * (name_left->len == 0). Object's refcount is incremented - * Not found: The last matched parent. (name_left->len > 0) - * Parent's refcount is incremented. - */ -struct object *find_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, struct unicode_str *name_left ) -{ - return lookup_named_object( &root->obj, name, attr, name_left ); -} - /* create a named (if name is present) or unnamed object. */ void *create_named_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attributes, const struct object_ops *ops ) @@ -257,13 +235,6 @@ void *create_named_object_dir( struct directory *root, const struct unicode_str return create_named_object( &root->obj, ops, name, attributes ); } -/* open a new handle to an existing object */ -void *open_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct object_ops *ops ) -{ - return open_named_object( &root->obj, ops, name, attr ); -} - /* retrieve an object type, creating it if needed */ struct object_type *get_object_type( const struct unicode_str *name ) { diff --git a/server/object.h b/server/object.h index f51fc71..566b6da 100644 --- a/server/object.h +++ b/server/object.h @@ -231,12 +231,8 @@ extern void release_global_atom( struct winstation *winstation, atom_t atom ); 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 ); extern void *create_named_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attr, const struct object_ops *ops ); -extern void *open_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct object_ops *ops ); extern struct object_type *get_object_type( const struct unicode_str *name ); extern int directory_link_name( struct object *obj, struct object_name *name, struct object *parent ); extern void init_directories(void);

1 0

Alexandre Julliard : server: Avoid redundant open call when looking for an object type.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: eb6621081a6d0f094d58c30e6850f3e01c88402e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb6621081a6d0f094d58c30e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:21:23 2016 +0900 server: Avoid redundant open call when looking for an object type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/directory.c b/server/directory.c index 312a845..67d8089 100644 --- a/server/directory.c +++ b/server/directory.c @@ -269,13 +269,13 @@ struct object_type *get_object_type( const struct unicode_str *name ) { struct object_type *type; - if ((type = open_object_dir( dir_objtype, name, 0, &object_type_ops ))) - return type; - - if ((type = create_named_object_dir( dir_objtype, name, 0, &object_type_ops ))) + if ((type = create_named_object_dir( dir_objtype, name, OBJ_OPENIF, &object_type_ops ))) { - grab_object( type ); - make_object_static( &type->obj ); + if (get_error() != STATUS_OBJECT_NAME_EXISTS) + { + grab_object( type ); + make_object_static( &type->obj ); + } clear_error(); } return type;

1 0

Alexandre Julliard : server: Support opening objects from any root, not only directories.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 39e60dc68003813c020c9a29d4e69d2f7a809e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e60dc68003813c020c9a29d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:18:20 2016 +0900 server: Support opening objects from any root, not only directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 1 - server/handle.c | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 3d0487c..9d0f501 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -551,7 +551,6 @@ static void test_name_limits(void) status = pNtOpenSymbolicLinkObject( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSymbolicLinkObject failed %x\n", str.Length, status ); status = pNtOpenSymbolicLinkObject( &ret2, GENERIC_ALL, &attr3 ); - todo_wine ok( status == STATUS_SUCCESS, "%u: NtOpenSymbolicLinkObject failed %x\n", str.Length, status ); pNtClose( ret2 ); pNtClose( ret ); diff --git a/server/handle.c b/server/handle.c index f440f9f..15e5670 100644 --- a/server/handle.c +++ b/server/handle.c @@ -578,8 +578,7 @@ obj_handle_t open_object( struct process *process, obj_handle_t parent, unsigned unsigned int attributes ) { obj_handle_t handle = 0; - struct directory *root = NULL; - struct object *obj; + struct object *obj, *root = NULL; if (name->len >= 65534) { @@ -587,9 +586,9 @@ obj_handle_t open_object( struct process *process, obj_handle_t parent, unsigned return 0; } - if (parent && !(root = get_directory_obj( process, parent, 0 ))) return 0; + if (parent && !(root = get_handle_obj( process, parent, 0, NULL ))) return 0; - if ((obj = open_object_dir( root, name, attributes, ops ))) + if ((obj = open_named_object( root, ops, name, attributes ))) { handle = alloc_handle( process, obj, access, attributes ); release_object( obj );

1 0

Sebastian Lackner : server: Fix an invalid memory access in subtract_overlapping (Valgrind).
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 79ada317148657b90420c48c8c7620e375afae0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ada317148657b90420c48c8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 9 09:16:49 2016 +0100 server: Fix an invalid memory access in subtract_overlapping (Valgrind). Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/region.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/region.c b/server/region.c index 464c5ad..33e2a54 100644 --- a/server/region.c +++ b/server/region.c @@ -469,7 +469,8 @@ static int subtract_overlapping( struct region *pReg, rect->bottom = bottom; } r1++; - left = r1->left; + if (r1 != r1End) + left = r1->left; } }

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_update_surface().
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 85ba92c33a8c689e375fae2f3313657aaa9877fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ba92c33a8c689e375fae2f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:03 2016 +0100 wined3d: Get rid of wined3d_device_update_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 22 +--------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 18fdc1d..14e1f51 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3676,7 +3676,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, i * src_levels + j + src_skip_levels)); dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i * dst_levels + j)); - if (FAILED(hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL))) + if (FAILED(hr = surface_upload_from_surface(dst_surface, NULL, src_surface, NULL))) { WARN("Failed to update surface, hr %#x.\n", hr); return hr; @@ -3850,26 +3850,6 @@ float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) return 0.0f; } -/* FIXME: Callers should probably use wined3d_device_update_sub_resource() - * instead. */ -HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, - struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const POINT *dst_point) -{ - TRACE("device %p, src_surface %p, src_rect %s, dst_surface %p, dst_point %s.\n", - device, src_surface, wine_dbgstr_rect(src_rect), - dst_surface, wine_dbgstr_point(dst_point)); - - if (src_surface->resource.pool != WINED3D_POOL_SYSTEM_MEM || dst_surface->resource.pool != WINED3D_POOL_DEFAULT) - { - WARN("source %p must be SYSTEMMEM and dest %p must be DEFAULT, returning WINED3DERR_INVALIDCALL\n", - src_surface, dst_surface); - return WINED3DERR_INVALIDCALL; - } - - return surface_upload_from_surface(dst_surface, dst_point, src_surface, src_rect); -} - void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d31cf9a..532702e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -160,7 +160,6 @@ @ cdecl wined3d_device_uninit_3d(ptr) @ cdecl wined3d_device_uninit_gdi(ptr) @ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long) -@ cdecl wined3d_device_update_surface(ptr ptr ptr ptr ptr) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b8bf7b..420a55b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2319,8 +2319,6 @@ HRESULT __cdecl wined3d_device_uninit_gdi(struct wined3d_device *device); void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch); -HRESULT __cdecl wined3d_device_update_surface(struct wined3d_device *device, struct wined3d_surface *src_surface, - const RECT *src_rect, struct wined3d_surface *dst_surface, const POINT *dst_point); HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes);

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_update_overlay().
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 02008a6f2e373ba4ff06deb8ca124ecd65b57227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02008a6f2e373ba4ff06deb8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:01 2016 +0100 wined3d: Introduce wined3d_texture_update_overlay(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 22 +++++++++++----- dlls/wined3d/surface.c | 47 ---------------------------------- dlls/wined3d/texture.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 5 ++-- 5 files changed, 84 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02008a6f2e373ba4ff06d…

1 0

Henri Verbeet : wined3d: Get rid of wined3d_surface_update_overlay_z_order ().
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: f0053d06c4fc168360da638fa26f1927fe975262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0053d06c4fc168360da638fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:02 2016 +0100 wined3d: Get rid of wined3d_surface_update_overlay_z_order(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 22 +++++++++------------- dlls/wined3d/surface.c | 14 -------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 5 files changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f2399e4..d73d87b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -162,7 +162,6 @@ struct ddraw_surface /* Connections to other Objects */ struct ddraw *ddraw; - struct wined3d_surface *wined3d_surface; struct wined3d_texture *wined3d_texture; unsigned int sub_resource_idx; struct wined3d_rendertarget_view *wined3d_rtv; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9b7d76e..d5ebe31 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1216,7 +1216,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; struct wined3d_texture *texture; IDirectDrawSurface7 *current; - struct wined3d_surface *tmp; HRESULT hr; TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); @@ -1237,7 +1236,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 } tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl); - tmp = dst_impl->wined3d_surface; if (dst_impl->sub_resource_idx) ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; @@ -1269,7 +1267,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); - dst_impl->wined3d_surface = src_impl->wined3d_surface; prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); if (src_impl->sub_resource_idx) @@ -1301,7 +1298,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); - dst_impl->wined3d_surface = src_impl->wined3d_surface; prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); ddraw_texture = prev_ddraw_texture; @@ -1319,7 +1315,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); src_impl->wined3d_rtv = tmp_rtv; wined3d_resource_set_parent(wined3d_texture_get_sub_resource(texture, 0), src_impl); - src_impl->wined3d_surface = tmp; wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); src_impl->wined3d_texture = texture; @@ -3843,20 +3838,22 @@ static HRESULT WINAPI ddraw_surface1_UpdateOverlayDisplay(IDirectDrawSurface *if * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_UpdateOverlayZOrder(IDirectDrawSurface7 *iface, - DWORD Flags, IDirectDrawSurface7 *DDSRef) + DWORD flags, IDirectDrawSurface7 *reference) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct ddraw_surface *reference_impl = unsafe_impl_from_IDirectDrawSurface7(DDSRef); - HRESULT hr; - TRACE("iface %p, flags %#x, reference %p.\n", iface, Flags, DDSRef); + FIXME("iface %p, flags %#x, reference %p stub!\n", iface, flags, reference); wined3d_mutex_lock(); - hr = wined3d_surface_update_overlay_z_order(surface->wined3d_surface, - Flags, reference_impl ? reference_impl->wined3d_surface : NULL); + if (!(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_OVERLAY)) + { + WARN("Not an overlay surface.\n"); + wined3d_mutex_unlock(); + return DDERR_NOTAOVERLAYSURFACE; + } wined3d_mutex_unlock(); - return hr; + return DD_OK; } static HRESULT WINAPI ddraw_surface4_UpdateOverlayZOrder(IDirectDrawSurface4 *iface, @@ -6302,7 +6299,6 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, } desc->lpSurface = NULL; - surface->wined3d_surface = wined3d_surface; wined3d_texture_incref(surface->wined3d_texture = wined3d_texture); surface->sub_resource_idx = sub_resource_idx; *parent_ops = &ddraw_surface_wined3d_parent_ops; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 53f4d09..11db96e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1909,20 +1909,6 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) return pitch; } -HRESULT CDECL wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface, - DWORD flags, struct wined3d_surface *ref) -{ - FIXME("surface %p, flags %#x, ref %p stub!\n", surface, flags, ref); - - if (!(surface->resource.usage & WINED3DUSAGE_OVERLAY)) - { - TRACE("Not an overlay surface.\n"); - return WINEDDERR_NOTAOVERLAYSURFACE; - } - - return WINED3D_OK; -} - HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 53eb97a..d31cf9a 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_update_overlay_z_order(ptr long ptr) @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 40f3d49..0b8bf7b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2477,8 +2477,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_update_overlay_z_order(struct wined3d_surface *surface, - DWORD flags, struct wined3d_surface *ref); HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain);

1 0

Jacek Caban : mshtml/tests: Fixed style tests on IE6.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 433f82c74e5b203d35b00f015841ec2b448542eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=433f82c74e5b203d35b00f015… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 17:52:17 2016 +0100 mshtml/tests: Fixed style tests on IE6. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/style.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 94ccc76..3da1a70 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2935,14 +2935,17 @@ static void test_current_style(IHTMLCurrentStyle *current_style) IHTMLCurrentStyle3_Release(current_style3); hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle4, (void**)&current_style4); - ok(hres == S_OK, "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); - - hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); - ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); - ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); - VariantClear(&v); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); + VariantClear(&v); - IHTMLCurrentStyle4_Release(current_style4); + IHTMLCurrentStyle4_Release(current_style4); + }else { + win_skip("IHTMLCurrentStyle4 not supported.\n"); + } } static const char basic_test_str[] = "<html><body><div id=\"divid\"></div/</body></html>";

1 0

Alexandre Julliard : ntdll/tests: Fix a couple of test failures on limited user accounts.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: b35642f5161f5c2016d3d25846ef23ec92bd87ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b35642f5161f5c2016d3d2584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 12:01:30 2016 +0900 ntdll/tests: Fix a couple of test failures on limited user accounts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 6957ef3..d00a496 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -591,8 +591,9 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - pNtClose( subkey ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); /* the REGISTRY part is case-sensitive unless OBJ_CASE_INSENSITIVE is specified */ @@ -605,14 +606,16 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - pNtClose( subkey ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - pNtClose( subkey ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pNtClose(key);

1 0