January 2016 - Wine-commits

Józef Kucia : wined3d: Recognize SM4 _sat instruction modifier.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: ee85c032652adeb2c0c8f87f5ecc9aa73c4d0c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee85c032652adeb2c0c8f87f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:47 2016 +0100 wined3d: Recognize SM4 _sat instruction modifier. 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/wined3d/shader_sm4.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index fb104fc..d275923 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -30,7 +30,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) #define WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT 11 -#define WINED3D_SM4_INSTRUCTION_FLAGS_MASK (0x3u << WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT) +#define WINED3D_SM4_INSTRUCTION_FLAGS_MASK (0x7u << WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT) #define WINED3D_SM4_RESOURCE_TYPE_SHIFT 11 #define WINED3D_SM4_RESOURCE_TYPE_MASK (0xfu << WINED3D_SM4_RESOURCE_TYPE_SHIFT) @@ -75,6 +75,8 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_ADDRESSING_RELATIVE 0x2 #define WINED3D_SM4_ADDRESSING_OFFSET 0x1 +#define WINED3D_SM4_INSTRUCTION_FLAG_SATURATE 0x4 + enum wined3d_sm4_opcode { WINED3D_SM4_OP_ADD = 0x00, @@ -900,8 +902,16 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } else { + enum wined3d_shader_dst_modifier instruction_dst_modifier = WINED3DSPDM_NONE; + ins->flags = (opcode_token & WINED3D_SM4_INSTRUCTION_FLAGS_MASK) >> WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT; + if (ins->flags & WINED3D_SM4_INSTRUCTION_FLAG_SATURATE) + { + ins->flags &= ~WINED3D_SM4_INSTRUCTION_FLAG_SATURATE; + instruction_dst_modifier = WINED3DSPDM_SATURATE; + } + for (i = 0; i < ins->dst_count; ++i) { if (!(shader_sm4_read_dst_param(priv, &p, map_data_type(opcode_info->dst_info[i]), &priv->dst_param[i]))) @@ -909,6 +919,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->handler_idx = WINED3DSIH_TABLE_SIZE; return; } + priv->dst_param[i].modifiers |= instruction_dst_modifier; } for (i = 0; i < ins->src_count; ++i)

1 0

Józef Kucia : wined3d: Fix SM4 udiv instruction.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: f92d7726881029f159cb9d2f92acf7cf0cab600f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92d7726881029f159cb9d2f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:48 2016 +0100 wined3d: Fix SM4 udiv instruction. Previously, it generated syntactically incorrect GLSL when both dst params were not equal to NULL. 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/wined3d/glsl_shader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 07a8fc4..8dc97b9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3019,7 +3019,6 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) if (ins->dst[0].reg.type != WINED3DSPR_NULL) { - if (ins->dst[1].reg.type != WINED3DSPR_NULL) { char dst_mask[6]; @@ -3027,15 +3026,15 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) write_mask = shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_addline(buffer, "tmp0%s = %s / %s;\n", + shader_addline(buffer, "tmp0%s = uintBitsToFloat(%s / %s);\n", dst_mask, src0_param.param_str, src1_param.param_str); write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_addline(buffer, "%s %% %s));\n", src0_param.param_str, src1_param.param_str); + shader_addline(buffer, "%s %% %s);\n", src0_param.param_str, src1_param.param_str); - shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], WINED3D_DATA_FLOAT); shader_addline(buffer, "tmp0%s);\n", dst_mask); } else

1 0

Nikolay Sivov : dwrite: Use callback freetype API to implement GetGlyphRunOutline().
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: ff8f129af64c1ef4d237cc6698d1d6bf85510ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8f129af64c1ef4d237cc669… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 19 00:47:09 2016 +0300 dwrite: Use callback freetype API to implement GetGlyphRunOutline(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 19 +-- dlls/dwrite/font.c | 110 +---------------- dlls/dwrite/freetype.c | 281 +++++++++++++++++++++++++------------------ 3 files changed, 169 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff8f129af64c1ef4d237c…

1 0

Alexandre Julliard : server: Pass full object attributes in the create_directory request.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 82800f513c19a8e1c98a2ed6c1eb71a5d25680bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82800f513c19a8e1c98a2ed6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 19:02:18 2016 +0900 server: Pass full object attributes in the create_directory request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/om.c | 16 +++++++++------- include/wine/server_protocol.h | 4 +--- server/directory.c | 33 ++++++++++++++++++--------------- server/protocol.def | 4 +--- server/request.h | 4 +--- server/trace.c | 4 +--- 6 files changed, 31 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 3fadba7..cc3b4d6 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -478,25 +478,27 @@ NTSTATUS WINAPI NtOpenDirectoryObject(PHANDLE DirectoryHandle, ACCESS_MASK Desir * Failure: An NTSTATUS error code. */ NTSTATUS WINAPI NtCreateDirectoryObject(PHANDLE DirectoryHandle, ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes) + OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; + data_size_t len; + struct object_attributes *objattr; if (!DirectoryHandle) return STATUS_ACCESS_VIOLATION; - TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); + TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(attr)); + + if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; SERVER_START_REQ(create_directory) { req->access = DesiredAccess; - req->attributes = ObjectAttributes ? ObjectAttributes->Attributes : 0; - req->rootdir = wine_server_obj_handle( ObjectAttributes ? ObjectAttributes->RootDirectory : 0 ); - if (ObjectAttributes && ObjectAttributes->ObjectName) - wine_server_add_data(req, ObjectAttributes->ObjectName->Buffer, - ObjectAttributes->ObjectName->Length); + wine_server_add_data( req, objattr, len ); ret = wine_server_call( req ); *DirectoryHandle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e5b7506..8566617 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4710,9 +4710,7 @@ struct create_directory_request { struct request_header __header; unsigned int access; - unsigned int attributes; - obj_handle_t rootdir; - /* VARARG(directory_name,unicode_str); */ + /* VARARG(objattr,object_attributes); */ }; struct create_directory_reply { diff --git a/server/directory.c b/server/directory.c index e0cf75e..d05b60f 100644 --- a/server/directory.c +++ b/server/directory.c @@ -189,7 +189,8 @@ static void directory_destroy( struct object *obj ) } static struct directory *create_directory( struct directory *root, const struct unicode_str *name, - unsigned int attr, unsigned int hash_size ) + unsigned int attr, unsigned int hash_size, + const struct security_descriptor *sd ) { struct directory *dir; @@ -201,6 +202,8 @@ static struct directory *create_directory( struct directory *root, const struct release_object( dir ); dir = NULL; } + if (sd) default_set_sd( &dir->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); } return dir; } @@ -440,19 +443,19 @@ void init_directories(void) struct keyed_event *keyed_event; unsigned int i; - root_directory = create_directory( NULL, NULL, 0, HASH_SIZE ); - dir_driver = create_directory( root_directory, &dir_driver_str, 0, HASH_SIZE ); - dir_device = create_directory( root_directory, &dir_device_str, 0, HASH_SIZE ); - dir_objtype = create_directory( root_directory, &dir_objtype_str, 0, HASH_SIZE ); - dir_sessions = create_directory( root_directory, &dir_sessions_str, 0, HASH_SIZE ); - dir_kernel = create_directory( root_directory, &dir_kernel_str, 0, HASH_SIZE ); + root_directory = create_directory( NULL, NULL, 0, HASH_SIZE, NULL ); + dir_driver = create_directory( root_directory, &dir_driver_str, 0, HASH_SIZE, NULL ); + dir_device = create_directory( root_directory, &dir_device_str, 0, HASH_SIZE, NULL ); + dir_objtype = create_directory( root_directory, &dir_objtype_str, 0, HASH_SIZE, NULL ); + dir_sessions = create_directory( root_directory, &dir_sessions_str, 0, HASH_SIZE, NULL ); + dir_kernel = create_directory( root_directory, &dir_kernel_str, 0, HASH_SIZE, NULL ); make_object_static( &root_directory->obj ); make_object_static( &dir_driver->obj ); make_object_static( &dir_objtype->obj ); - dir_global = create_directory( NULL, &dir_global_str, 0, HASH_SIZE ); + dir_global = create_directory( NULL, &dir_global_str, 0, HASH_SIZE, NULL ); /* use a larger hash table for this one since it can contain a lot of objects */ - dir_basenamed = create_directory( NULL, &dir_basenamed_str, 0, 37 ); + dir_basenamed = create_directory( NULL, &dir_basenamed_str, 0, 37, NULL ); /* devices */ create_named_pipe_device( dir_device, &named_pipe_str ); @@ -501,15 +504,15 @@ DECL_HANDLER(create_directory) { struct unicode_str name; struct directory *dir, *root = NULL; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); - reply->handle = 0; - get_req_unicode_str( &name ); - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - return; + if (!objattr) return; + if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; - if ((dir = create_directory( root, &name, req->attributes, HASH_SIZE ))) + if ((dir = create_directory( root, &name, objattr->attributes, HASH_SIZE, sd ))) { - reply->handle = alloc_handle( current->process, dir, req->access, req->attributes ); + reply->handle = alloc_handle( current->process, dir, req->access, objattr->attributes ); release_object( dir ); } diff --git a/server/protocol.def b/server/protocol.def index 72a63e4..28c7022 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3300,9 +3300,7 @@ struct handle_info /* Create a directory object */ @REQ(create_directory) unsigned int access; /* access flags */ - unsigned int attributes; /* object attributes */ - obj_handle_t rootdir; /* root directory */ - VARARG(directory_name,unicode_str); /* Directory name */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* handle to the directory */ @END diff --git a/server/request.h b/server/request.h index 310bcf4..2acf9cd 100644 --- a/server/request.h +++ b/server/request.h @@ -2095,9 +2095,7 @@ C_ASSERT( FIELD_OFFSET(struct set_mailslot_info_reply, read_timeout) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_mailslot_info_reply, max_msgsize) == 16 ); C_ASSERT( sizeof(struct set_mailslot_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_directory_request, access) == 12 ); -C_ASSERT( FIELD_OFFSET(struct create_directory_request, attributes) == 16 ); -C_ASSERT( FIELD_OFFSET(struct create_directory_request, rootdir) == 20 ); -C_ASSERT( sizeof(struct create_directory_request) == 24 ); +C_ASSERT( sizeof(struct create_directory_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_directory_reply, handle) == 8 ); C_ASSERT( sizeof(struct create_directory_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_directory_request, access) == 12 ); diff --git a/server/trace.c b/server/trace.c index 82f8342..87fe202 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3892,9 +3892,7 @@ static void dump_set_mailslot_info_reply( const struct set_mailslot_info_reply * static void dump_create_directory_request( const struct create_directory_request *req ) { fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); - dump_varargs_unicode_str( ", directory_name=", cur_size ); + dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_directory_reply( const struct create_directory_reply *req )

1 0

Alexandre Julliard : server: Pass full object attributes in the create_symlink request.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 426c4a2f085a99eb45ea1f27a418d69fda9d4cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426c4a2f085a99eb45ea1f27a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 20:33:20 2016 +0900 server: Pass full object attributes in the create_symlink request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/om.c | 22 +++++++++------------- include/wine/server_protocol.h | 6 +----- server/directory.c | 18 +++++++++--------- server/object.h | 3 ++- server/protocol.def | 5 +---- server/request.h | 5 +---- server/symlink.c | 32 ++++++++++++++++++-------------- 7 files changed, 41 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index cc3b4d6..4fbb973 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -636,35 +636,31 @@ NTSTATUS WINAPI NtOpenSymbolicLinkObject(OUT PHANDLE LinkHandle, IN ACCESS_MASK * Failure: An NTSTATUS error code. */ NTSTATUS WINAPI NtCreateSymbolicLinkObject(OUT PHANDLE SymbolicLinkHandle,IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PUNICODE_STRING TargetName) + POBJECT_ATTRIBUTES attr, PUNICODE_STRING TargetName) { NTSTATUS ret; + data_size_t len; + struct object_attributes *objattr; if (!SymbolicLinkHandle || !TargetName) return STATUS_ACCESS_VIOLATION; if (!TargetName->Buffer) return STATUS_INVALID_PARAMETER; TRACE("(%p,0x%08x,%s -> %s)\n", SymbolicLinkHandle, DesiredAccess, - debugstr_ObjectAttributes(ObjectAttributes), debugstr_us(TargetName)); + debugstr_ObjectAttributes(attr), debugstr_us(TargetName)); + + if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; SERVER_START_REQ(create_symlink) { req->access = DesiredAccess; - req->attributes = ObjectAttributes ? ObjectAttributes->Attributes : 0; - req->rootdir = wine_server_obj_handle( ObjectAttributes ? ObjectAttributes->RootDirectory : 0 ); - if (ObjectAttributes && ObjectAttributes->ObjectName) - { - req->name_len = ObjectAttributes->ObjectName->Length; - wine_server_add_data(req, ObjectAttributes->ObjectName->Buffer, - ObjectAttributes->ObjectName->Length); - } - else - req->name_len = 0; + wine_server_add_data( req, objattr, len ); wine_server_add_data(req, TargetName->Buffer, TargetName->Length); ret = wine_server_call( req ); *SymbolicLinkHandle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8566617..4614c98 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4760,12 +4760,8 @@ struct create_symlink_request { struct request_header __header; unsigned int access; - unsigned int attributes; - obj_handle_t rootdir; - data_size_t name_len; - /* VARARG(name,unicode_str,name_len); */ + /* VARARG(objattr,object_attributes); */ /* VARARG(target_name,unicode_str); */ - char __pad_28[4]; }; struct create_symlink_reply { diff --git a/server/directory.c b/server/directory.c index d05b60f..05dddec 100644 --- a/server/directory.c +++ b/server/directory.c @@ -463,15 +463,15 @@ void init_directories(void) create_unix_device( dir_device, &null_str, "/dev/null" ); /* symlinks */ - link_dosdev = create_symlink( root_directory, &link_dosdev_str, 0, &dir_global_str ); - link_global1 = create_symlink( dir_global, &link_global_str, 0, &dir_global_str ); - link_global2 = create_symlink( dir_basenamed, &link_global_str, 0, &dir_basenamed_str ); - link_local = create_symlink( dir_basenamed, &link_local_str, 0, &dir_basenamed_str ); - link_nul = create_symlink( dir_global, &link_nul_str, 0, &dir_null_str ); - link_pipe = create_symlink( dir_global, &link_pipe_str, 0, &dir_named_pipe_str ); - link_mailslot = create_symlink( dir_global, &link_mailslot_str, 0, &dir_mailslot_str ); - link_0 = create_symlink( dir_sessions, &link_0_str, 0, &dir_basenamed_str ); - link_session = create_symlink( dir_basenamed, &link_session_str, 0, &link_sessions_str ); + link_dosdev = create_symlink( root_directory, &link_dosdev_str, 0, &dir_global_str, NULL ); + link_global1 = create_symlink( dir_global, &link_global_str, 0, &dir_global_str, NULL ); + link_global2 = create_symlink( dir_basenamed, &link_global_str, 0, &dir_basenamed_str, NULL ); + link_local = create_symlink( dir_basenamed, &link_local_str, 0, &dir_basenamed_str, NULL ); + link_nul = create_symlink( dir_global, &link_nul_str, 0, &dir_null_str, NULL ); + link_pipe = create_symlink( dir_global, &link_pipe_str, 0, &dir_named_pipe_str, NULL ); + link_mailslot = create_symlink( dir_global, &link_mailslot_str, 0, &dir_mailslot_str, NULL ); + link_0 = create_symlink( dir_sessions, &link_0_str, 0, &dir_basenamed_str, NULL ); + link_session = create_symlink( dir_basenamed, &link_session_str, 0, &link_sessions_str, NULL ); make_object_static( (struct object *)link_dosdev ); make_object_static( (struct object *)link_global1 ); make_object_static( (struct object *)link_global2 ); diff --git a/server/object.h b/server/object.h index b59811f..8e010a3 100644 --- a/server/object.h +++ b/server/object.h @@ -222,7 +222,8 @@ extern void init_directories(void); /* symbolic link functions */ extern struct symlink *create_symlink( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct unicode_str *target ); + unsigned int attr, const struct unicode_str *target, + const struct security_descriptor *sd ); /* global variables */ diff --git a/server/protocol.def b/server/protocol.def index 28c7022..cbf5ea7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3331,10 +3331,7 @@ struct handle_info /* Create a symbolic link object */ @REQ(create_symlink) unsigned int access; /* access flags */ - unsigned int attributes; /* object attributes */ - obj_handle_t rootdir; /* root directory */ - data_size_t name_len; /* length of the symlink name in bytes */ - VARARG(name,unicode_str,name_len); /* symlink name */ + VARARG(objattr,object_attributes); /* object attributes */ VARARG(target_name,unicode_str); /* target name */ @REPLY obj_handle_t handle; /* handle to the symlink */ diff --git a/server/request.h b/server/request.h index 2acf9cd..e1d2487 100644 --- a/server/request.h +++ b/server/request.h @@ -2110,10 +2110,7 @@ C_ASSERT( sizeof(struct get_directory_entry_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_directory_entry_reply, name_len) == 8 ); C_ASSERT( sizeof(struct get_directory_entry_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_symlink_request, access) == 12 ); -C_ASSERT( FIELD_OFFSET(struct create_symlink_request, attributes) == 16 ); -C_ASSERT( FIELD_OFFSET(struct create_symlink_request, rootdir) == 20 ); -C_ASSERT( FIELD_OFFSET(struct create_symlink_request, name_len) == 24 ); -C_ASSERT( sizeof(struct create_symlink_request) == 32 ); +C_ASSERT( sizeof(struct create_symlink_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_symlink_reply, handle) == 8 ); C_ASSERT( sizeof(struct create_symlink_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_symlink_request, access) == 12 ); diff --git a/server/symlink.c b/server/symlink.c index 2330fde..28d51ab 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -132,7 +132,8 @@ static void symlink_destroy( struct object *obj ) } struct symlink *create_symlink( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct unicode_str *target ) + unsigned int attr, const struct unicode_str *target, + const struct security_descriptor *sd ) { struct symlink *symlink; @@ -145,7 +146,13 @@ struct symlink *create_symlink( struct directory *root, const struct unicode_str (get_error() != STATUS_OBJECT_NAME_EXISTS)) { if ((symlink->target = memdup( target->str, target->len ))) + { symlink->len = target->len; + if (sd) + default_set_sd( &symlink->obj, sd, + OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); + } else { release_object( symlink ); @@ -162,23 +169,20 @@ DECL_HANDLER(create_symlink) struct symlink *symlink; struct unicode_str name, target; struct directory *root = NULL; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); - if (req->name_len > get_req_data_size()) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - name.str = get_req_data(); - target.str = name.str + req->name_len / sizeof(WCHAR); - name.len = (target.str - name.str) * sizeof(WCHAR); - target.len = ((get_req_data_size() - name.len) / sizeof(WCHAR)) * sizeof(WCHAR); + if (!objattr) return; - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - return; + target.str = (const WCHAR *)get_req_data() + sizeof(*objattr) / sizeof(WCHAR) + + objattr->sd_len / sizeof(WCHAR) + name.len / sizeof(WCHAR); + target.len = get_req_data_size() - ((const char *)target.str - (const char *)get_req_data()); + + if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; - if ((symlink = create_symlink( root, &name, req->attributes, &target ))) + if ((symlink = create_symlink( root, &name, objattr->attributes, &target, sd ))) { - reply->handle = alloc_handle( current->process, symlink, req->access, req->attributes ); + reply->handle = alloc_handle( current->process, symlink, req->access, objattr->attributes ); release_object( symlink ); }

1 0

Alexandre Julliard : server: Pass full object attributes in the create_completion request.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 1eb69be36f176f499b67a16c93a470475bb1b330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb69be36f176f499b67a16c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 20:49:38 2016 +0900 server: Pass full object attributes in the create_completion request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 17 +++++++++-------- include/wine/server_protocol.h | 8 +++----- server/completion.c | 20 ++++++++++++-------- server/protocol.def | 4 +--- server/request.h | 6 ++---- server/trace.c | 4 +--- 6 files changed, 28 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 1206627..a6de6a1 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1153,29 +1153,30 @@ NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key, * */ NTSTATUS WINAPI NtCreateIoCompletion( PHANDLE CompletionPort, ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, ULONG NumberOfConcurrentThreads ) + POBJECT_ATTRIBUTES attr, ULONG NumberOfConcurrentThreads ) { NTSTATUS status; + data_size_t len; + struct object_attributes *objattr; - TRACE("(%p, %x, %p, %d)\n", CompletionPort, DesiredAccess, - ObjectAttributes, NumberOfConcurrentThreads); + TRACE("(%p, %x, %p, %d)\n", CompletionPort, DesiredAccess, attr, NumberOfConcurrentThreads); if (!CompletionPort) return STATUS_INVALID_PARAMETER; + if ((status = alloc_object_attributes( attr, &objattr, &len ))) return status; + SERVER_START_REQ( create_completion ) { req->access = DesiredAccess; - req->attributes = ObjectAttributes ? ObjectAttributes->Attributes : 0; - req->rootdir = wine_server_obj_handle( ObjectAttributes ? ObjectAttributes->RootDirectory : 0 ); req->concurrent = NumberOfConcurrentThreads; - if (ObjectAttributes && ObjectAttributes->ObjectName) - wine_server_add_data( req, ObjectAttributes->ObjectName->Buffer, - ObjectAttributes->ObjectName->Length ); + wine_server_add_data( req, objattr, len ); if (!(status = wine_server_call( req ))) *CompletionPort = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4614c98..19ea2fc 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4980,11 +4980,9 @@ struct create_completion_request { struct request_header __header; unsigned int access; - unsigned int attributes; unsigned int concurrent; - obj_handle_t rootdir; - /* VARARG(filename,unicode_str); */ - char __pad_28[4]; + /* VARARG(objattr,object_attributes); */ + char __pad_20[4]; }; struct create_completion_reply { @@ -6161,6 +6159,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 496 +#define SERVER_PROTOCOL_VERSION 497 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/completion.c b/server/completion.c index 77c72cc..a93551f 100644 --- a/server/completion.c +++ b/server/completion.c @@ -130,7 +130,9 @@ static unsigned int completion_map_access( struct object *obj, unsigned int acce return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } -static struct completion *create_completion( struct directory *root, const struct unicode_str *name, unsigned int attr, unsigned int concurrent ) +static struct completion *create_completion( struct directory *root, const struct unicode_str *name, + unsigned int attr, unsigned int concurrent, + const struct security_descriptor *sd ) { struct completion *completion; @@ -140,6 +142,9 @@ static struct completion *create_completion( struct directory *root, const struc { list_init( &completion->queue ); completion->depth = 0; + if (sd) default_set_sd( &completion->obj, sd, + OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); } } @@ -175,16 +180,15 @@ DECL_HANDLER(create_completion) struct completion *completion; struct unicode_str name; struct directory *root = NULL; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); - reply->handle = 0; - - get_req_unicode_str( &name ); - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - return; + if (!objattr) return; + if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; - if ( (completion = create_completion( root, &name, req->attributes, req->concurrent )) != NULL ) + if ((completion = create_completion( root, &name, objattr->attributes, req->concurrent, sd ))) { - reply->handle = alloc_handle( current->process, completion, req->access, req->attributes ); + reply->handle = alloc_handle( current->process, completion, req->access, objattr->attributes ); release_object( completion ); } diff --git a/server/protocol.def b/server/protocol.def index cbf5ea7..390651d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3466,10 +3466,8 @@ struct handle_info /* Create I/O completion port */ @REQ(create_completion) unsigned int access; /* desired access to a port */ - unsigned int attributes; /* object attributes */ unsigned int concurrent; /* max number of concurrent active threads */ - obj_handle_t rootdir; /* root directory */ - VARARG(filename,unicode_str); /* port name */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* port handle */ @END diff --git a/server/request.h b/server/request.h index e1d2487..2c99c79 100644 --- a/server/request.h +++ b/server/request.h @@ -2182,10 +2182,8 @@ C_ASSERT( FIELD_OFFSET(struct get_token_statistics_reply, group_count) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_token_statistics_reply, privilege_count) == 36 ); C_ASSERT( sizeof(struct get_token_statistics_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct create_completion_request, access) == 12 ); -C_ASSERT( FIELD_OFFSET(struct create_completion_request, attributes) == 16 ); -C_ASSERT( FIELD_OFFSET(struct create_completion_request, concurrent) == 20 ); -C_ASSERT( FIELD_OFFSET(struct create_completion_request, rootdir) == 24 ); -C_ASSERT( sizeof(struct create_completion_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct create_completion_request, concurrent) == 16 ); +C_ASSERT( sizeof(struct create_completion_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_completion_reply, handle) == 8 ); C_ASSERT( sizeof(struct create_completion_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_completion_request, access) == 12 ); diff --git a/server/trace.c b/server/trace.c index 87fe202..edbc8c9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4087,10 +4087,8 @@ static void dump_get_token_statistics_reply( const struct get_token_statistics_r static void dump_create_completion_request( const struct create_completion_request *req ) { fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", concurrent=%08x", req->concurrent ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); - dump_varargs_unicode_str( ", filename=", cur_size ); + dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_completion_reply( const struct create_completion_reply *req )

1 0

Christian Costa : d3dx9: Implement D3DXCreateAnimationController with a stubbed ID3DXAnimationController interface.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 16eaf69526cdbca6e5a03e1743760c39c90df885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16eaf69526cdbca6e5a03e174… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jan 14 22:36:05 2016 +0100 d3dx9: Implement D3DXCreateAnimationController with a stubbed ID3DXAnimationController interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/animation.c | 452 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36.spec | 2 +- include/d3dx9anim.h | 40 ++-- 4 files changed, 474 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16eaf69526cdbca6e5a03…

1 0

Alistair Leslie-Hughes : d3dx9: Implement GetMaxNum* functions.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 94cc44883fcdbb535aee4f5d110102a3c48085e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94cc44883fcdbb535aee4f5d1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 14 22:36:06 2016 +0100 d3dx9: Implement GetMaxNum* functions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/animation.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c index abee89f..9a8f8b5 100644 --- a/dlls/d3dx9_36/animation.c +++ b/dlls/d3dx9_36/animation.c @@ -27,6 +27,11 @@ struct d3dx9_animation_controller { ID3DXAnimationController ID3DXAnimationController_iface; LONG ref; + + UINT max_outputs; + UINT max_sets; + UINT max_tracks; + UINT max_events; }; static inline struct d3dx9_animation_controller *impl_from_ID3DXAnimationController(ID3DXAnimationController *iface) @@ -78,30 +83,38 @@ static ULONG WINAPI d3dx9_animation_controller_Release(ID3DXAnimationController static UINT WINAPI d3dx9_animation_controller_GetMaxNumAnimationOutputs(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); + struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); - return 0; + TRACE("iface %p.\n", iface); + + return animation->max_outputs; } static UINT WINAPI d3dx9_animation_controller_GetMaxNumAnimationSets(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); + struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); - return 0; + TRACE("iface %p.\n", iface); + + return animation->max_sets; } static UINT WINAPI d3dx9_animation_controller_GetMaxNumTracks(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); + struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); - return 0; + TRACE("iface %p.\n", iface); + + return animation->max_tracks; } static UINT WINAPI d3dx9_animation_controller_GetMaxNumEvents(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); + struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); - return 0; + TRACE("iface %p.\n", iface); + + return animation->max_events; } static HRESULT WINAPI d3dx9_animation_controller_RegisterAnimationOutput(ID3DXAnimationController *iface, @@ -445,6 +458,10 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets, object->ID3DXAnimationController_iface.lpVtbl = &d3dx9_animation_controller_vtbl; object->ref = 1; + object->max_outputs = max_outputs; + object->max_sets = max_sets; + object->max_tracks = max_tracks; + object->max_events = max_events; *controller = &object->ID3DXAnimationController_iface;

1 0

Alistair Leslie-Hughes : d3dx9/tests: Add D3DXCreateAnimationController tests.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 6097695d4bec31a2558ff9405cc244cb25e682b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6097695d4bec31a2558ff9405… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 14 22:36:07 2016 +0100 d3dx9/tests: Add D3DXCreateAnimationController tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 588654d..7c86190 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -11100,6 +11100,66 @@ static void test_compute_normals(void) free_test_context(test_context); } +static void D3DXCreateAnimationControllerTest(void) +{ + HRESULT hr; + ID3DXAnimationController *animation; + UINT value; + + hr = D3DXCreateAnimationController(0, 0, 0, 0, NULL); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + + hr = D3DXCreateAnimationController(0, 1, 1, 1, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + ok(!animation, "Got unexpected animation %p.\n", animation); + + hr = D3DXCreateAnimationController(1, 0, 1, 1, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + ok(!animation, "Got unexpected animation %p.\n", animation); + + hr = D3DXCreateAnimationController(1, 1, 0, 1, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + ok(!animation, "Got unexpected animation %p.\n", animation); + + hr = D3DXCreateAnimationController(1, 1, 1, 0, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + ok(!animation, "Got unexpected animation %p.\n", animation); + + hr = D3DXCreateAnimationController(1, 1, 1, 1, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + + value = animation->lpVtbl->GetMaxNumAnimationOutputs(animation); + ok(value == 1, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumAnimationSets(animation); + ok(value == 1, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumTracks(animation); + ok(value == 1, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumEvents(animation); + ok(value == 1, "Got unexpected value %u.\n", value); + + animation->lpVtbl->Release(animation); + + hr = D3DXCreateAnimationController(100, 101, 102, 103, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + + value = animation->lpVtbl->GetMaxNumAnimationOutputs(animation); + ok(value == 100, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumAnimationSets(animation); + ok(value == 101, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumTracks(animation); + ok(value == 102, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumEvents(animation); + ok(value == 103, "Got unexpected value %u.\n", value); + + animation->lpVtbl->Release(animation); +} + START_TEST(mesh) { D3DXBoundProbeTest(); @@ -11116,6 +11176,7 @@ START_TEST(mesh) D3DXCreateCylinderTest(); D3DXCreateTextTest(); D3DXCreateTorusTest(); + D3DXCreateAnimationControllerTest(); test_get_decl_length(); test_get_decl_vertex_size(); test_fvf_decl_conversion();

1 0

Alistair Leslie-Hughes : d3dx9/tests: DDS magic isn' t part of the DDS header.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 2b0278c70343435190c4b2ee892c527916728678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0278c70343435190c4b2ee8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 14 22:36:08 2016 +0100 d3dx9/tests: DDS magic isn't part of the DDS header. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 63 ++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 183086f..55e3d88 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -200,7 +200,6 @@ struct dds_pixel_format struct dds_header { - DWORD magic; DWORD size; DWORD flags; DWORD height; @@ -222,7 +221,6 @@ static void fill_dds_header(struct dds_header *header) { memset(header, 0, sizeof(*header)); - header->magic = MAKEFOURCC('D','D','S',' '); header->size = sizeof(*header); header->flags = DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT; header->height = 4; @@ -250,10 +248,12 @@ static void check_dds_pixel_format_(unsigned int line, D3DXIMAGE_INFO info; struct { + DWORD magic; struct dds_header header; BYTE data[256]; } dds; + dds.magic = MAKEFOURCC('D','D','S',' '); fill_dds_header(&dds.header); dds.header.pixel_format.flags = flags; dds.header.pixel_format.fourcc = fourcc; @@ -281,6 +281,7 @@ static void test_dds_header_handling(void) D3DXIMAGE_INFO info; struct { + DWORD magic; struct dds_header header; BYTE data[4096 * 1024]; } *dds; @@ -399,9 +400,10 @@ static void test_dds_header_handling(void) for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { - DWORD file_size = sizeof(dds->header) + tests[i].pixel_data_size; + DWORD file_size = sizeof(dds->magic) + sizeof(dds->header) + tests[i].pixel_data_size; assert(file_size <= sizeof(*dds)); + dds->magic = MAKEFOURCC('D','D','S',' '); fill_dds_header(&dds->header); dds->header.flags |= tests[i].flags; dds->header.width = tests[i].width; @@ -1234,7 +1236,12 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) RECT rect; ID3DXBuffer *buffer; IDirect3DSurface9 *surface; - struct dds_header *header; + struct + { + DWORD magic; + struct dds_header header; + BYTE *data; + } *dds; hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); if (FAILED(hr)) { @@ -1257,35 +1264,35 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { - header = ID3DXBuffer_GetBufferPointer(buffer); - - ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature.\n"); - ok(header->size == 124, "Invalid DDS size %u.\n", header->size); - ok(!header->height, "Got unexpected height %u.\n", header->height); - ok(!header->width, "Got unexpected width %u.\n", header->width); - ok(!header->depth, "Got unexpected depth %u.\n", header->depth); - ok(!header->miplevels, "Got unexpected miplevels %u.\n", header->miplevels); - ok(!header->pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", header->pitch_or_linear_size); - ok(header->caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %x.\n", header->caps); - ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), - "Got unexpected flags %x.\n", header->flags); + dds = ID3DXBuffer_GetBufferPointer(buffer); + + ok(dds->magic == MAKEFOURCC('D','D','S',' '), "Got unexpected DDS signature %#x.\n", dds->magic); + ok(dds->header.size == sizeof(dds->header), "Got unexpected DDS size %u.\n", dds->header.size); + ok(!dds->header.height, "Got unexpected height %u.\n", dds->header.height); + ok(!dds->header.width, "Got unexpected width %u.\n", dds->header.width); + ok(!dds->header.depth, "Got unexpected depth %u.\n", dds->header.depth); + ok(!dds->header.miplevels, "Got unexpected miplevels %u.\n", dds->header.miplevels); + ok(!dds->header.pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", dds->header.pitch_or_linear_size); + ok(dds->header.caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %#x.\n", dds->header.caps); + ok(dds->header.flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), + "Got unexpected flags %#x.\n", dds->header.flags); ID3DXBuffer_Release(buffer); } hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - header = ID3DXBuffer_GetBufferPointer(buffer); - - ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature.\n"); - ok(header->size == 124, "Invalid DDS size %u.\n", header->size); - ok(header->height == 4, "Got unexpected height %u.\n", header->height); - ok(header->width == 4, "Got unexpected width %u.\n", header->width); - ok(!header->depth, "Got unexpected depth %u.\n", header->depth); - ok(!header->miplevels, "Got unexpected miplevels %u.\n", header->miplevels); - ok(!header->pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", header->pitch_or_linear_size); - todo_wine ok(header->caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %x.\n", header->caps); - ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), - "Got unexpected flags %x.\n", header->flags); + + dds = ID3DXBuffer_GetBufferPointer(buffer); + ok(dds->magic == MAKEFOURCC('D','D','S',' '), "Got unexpected DDS signature %#x.\n", dds->magic); + ok(dds->header.size == sizeof(dds->header), "Got unexpected DDS size %u.\n", dds->header.size); + ok(dds->header.height == 4, "Got unexpected height %u.\n", dds->header.height); + ok(dds->header.width == 4, "Got unexpected width %u.\n", dds->header.width); + ok(!dds->header.depth, "Got unexpected depth %u.\n", dds->header.depth); + ok(!dds->header.miplevels, "Got unexpected miplevels %u.\n", dds->header.miplevels); + ok(!dds->header.pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", dds->header.pitch_or_linear_size); + todo_wine ok(dds->header.caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %#x.\n", dds->header.caps); + ok(dds->header.flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), + "Got unexpected flags %#x.\n", dds->header.flags); ID3DXBuffer_Release(buffer); IDirect3DSurface9_Release(surface);

1 0