October 2007 - Wine-commits

Marcus Meissner : d3d9/tests: Initialize shader to NULL.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 4a31362d537222109c672be3f18b7ed1732b4bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a31362d537222109c672be3f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 2 19:23:20 2007 +0200 d3d9/tests: Initialize shader to NULL. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 328813c..2402a97 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1375,7 +1375,7 @@ static void test_null_stream(void) IDirect3D9 *d3d9; HWND hwnd; HRESULT hr; - IDirect3DVertexShader9 *shader; + IDirect3DVertexShader9 *shader = NULL; IDirect3DVertexDeclaration9 *decl; DWORD shader_code[] = { 0xfffe0101, /* vs_1_1 */

1 0

Marcus Meissner : setupapi: Use correct parameter in pointer init.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 263cb44d7640dead60b9c989cded7b134f2f38d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=263cb44d7640dead60b9c989c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 2 19:26:15 2007 +0200 setupapi: Use correct parameter in pointer init. --- dlls/setupapi/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2459ccd..0ec77b9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1986,7 +1986,7 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet, static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, LPCWSTR parent, HKEY key, const GUID *class, DWORD flags) { - struct DeviceInfoSet *set = (struct DeviceInfoSet *)set; + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; DWORD i, len; WCHAR subKeyName[MAX_PATH]; LONG l = ERROR_SUCCESS;

1 0

Alexandre Julliard : ntdll: Fix the HEAP_CreateSubHeap return value ( spotted by Allan Tong).
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: cbf8838dfb30ce80c0cc4734739a624da54ffe0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf8838dfb30ce80c0cc47347… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 10:08:34 2007 +0200 ntdll: Fix the HEAP_CreateSubHeap return value (spotted by Allan Tong). --- dlls/ntdll/heap.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 43d31c3..440939d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -581,8 +581,8 @@ static void HEAP_ShrinkBlock(SUBHEAP *subheap, ARENA_INUSE *pArena, SIZE_T size) /*********************************************************************** * HEAP_InitSubHeap */ -static BOOL HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, - SIZE_T commitSize, SIZE_T totalSize ) +static SUBHEAP *HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, + SIZE_T commitSize, SIZE_T totalSize ) { SUBHEAP *subheap; FREE_LIST_ENTRY *pEntry; @@ -596,7 +596,7 @@ static BOOL HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, &commitSize, MEM_COMMIT, get_protection_type( flags ) )) { WARN("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address ); - return FALSE; + return NULL; } if (heap) @@ -677,7 +677,7 @@ static BOOL HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, HEAP_CreateFreeBlock( subheap, (LPBYTE)subheap->base + subheap->headerSize, subheap->size - subheap->headerSize ); - return TRUE; + return subheap; } /*********************************************************************** @@ -690,6 +690,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, void *base, DWORD flags, SIZE_T commitSize, SIZE_T totalSize ) { LPVOID address = base; + SUBHEAP *ret; /* round-up sizes on a 64K boundary */ totalSize = (totalSize + 0xffff) & 0xffff0000; @@ -710,14 +711,12 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, void *base, DWORD flags, /* Initialize subheap */ - if (!HEAP_InitSubHeap( heap, address, flags, commitSize, totalSize )) + if (!(ret = HEAP_InitSubHeap( heap, address, flags, commitSize, totalSize ))) { SIZE_T size = 0; if (!base) NtFreeVirtualMemory( NtCurrentProcess(), &address, &size, MEM_RELEASE ); - return NULL; } - - return (SUBHEAP *)address; + return ret; }

1 0

Juan Lang : ntdll: Fix a typo.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: dc7ee864b5033c01760cb3928a258f9587b3deac URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7ee864b5033c01760cb3928… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 2 09:50:49 2007 -0700 ntdll: Fix a typo. --- dlls/ntdll/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 440939d..e6ba48c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(heap); -/* Note: the heap data structures are losely based on what Pietrek describes in his +/* Note: the heap data structures are loosely based on what Pietrek describes in his * book 'Windows 95 System Programming Secrets', with some adaptations for * better compatibility with NT. */

1 0

Dan Hipschman : widl: Add newlines to error messages that are missing them.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 4c8c425f425907ddb6abf33294000e76e940ca05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8c425f425907ddb6abf3329… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Oct 2 21:38:31 2007 -0700 widl: Add newlines to error messages that are missing them. --- tools/widl/parser.y | 4 ++-- tools/widl/typegen.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c4fc2c9..365d546 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1291,7 +1291,7 @@ static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr) v->type->type = ptr_type; } else if (!arr) - error("%s: pointer attribute applied to non-pointer type", v->name); + error("%s: pointer attribute applied to non-pointer type\n", v->name); } sizeless = FALSE; @@ -1309,7 +1309,7 @@ static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr) error("%s: array dimension must be positive\n", v->name); if (0xffffffffuL / size < (unsigned long) dim->cval) - error("%s: total array size is too large", v->name); + error("%s: total array size is too large\n", v->name); else if (0xffffuL < size * dim->cval) v->type = make_type(RPC_FC_LGFARRAY, v->type); else diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 88bb7c9..b5c861c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1611,7 +1611,7 @@ static void write_struct_members(FILE *file, const type_t *type, fc = RPC_FC_ALIGNM8; break; default: - error("write_struct_members: cannot align type %d", ft->type); + error("write_struct_members: cannot align type %d\n", ft->type); } print_file(file, 2, "0x%x,\t/* %s */\n", fc, string_of_type(fc)); offset = (offset + (align - 1)) & ~(align - 1);

1 0

Dan Hipschman : widl: Add a declonly argument to write_type_left.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 32a2477ef574546a2ce1fbfdf2e327d7a5298a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a2477ef574546a2ce1fbfdf… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Oct 2 21:39:38 2007 -0700 widl: Add a declonly argument to write_type_left. --- tools/widl/client.c | 4 +- tools/widl/header.c | 67 ++++++++++++++++++++++++++++++++------------------ tools/widl/header.h | 6 +++- tools/widl/parser.y | 6 ++-- tools/widl/proxy.c | 4 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 16 ++++++------ 7 files changed, 63 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32a2477ef574546a2ce1f…

1 0

Dan Hipschman : widl: Write types in the format string comments.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 304852f97e8da64954e33ceb6ab5e014fa26049f URL: http://source.winehq.org/git/wine.git/?a=commit;h=304852f97e8da64954e33ceb6… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Oct 2 21:40:13 2007 -0700 widl: Write types in the format string comments. --- tools/widl/header.c | 12 +++++++++--- tools/widl/typegen.c | 21 ++++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 07a562b..2643f49 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -195,6 +195,8 @@ int needs_space_after(type_t *t) void write_type_left(FILE *h, type_t *t, int declonly) { + if (!h) return; + if (t->is_const) fprintf(h, "const "); if (t->kind == TKIND_ALIAS) fprintf(h, "%s", t->name); @@ -214,7 +216,7 @@ void write_type_left(FILE *h, type_t *t, int declonly) indent(h, -1); fprintf(h, "}"); } - else fprintf(h, "enum %s", t->name); + else fprintf(h, "enum %s", t->name ? t->name : ""); break; case RPC_FC_STRUCT: case RPC_FC_CVSTRUCT: @@ -232,7 +234,7 @@ void write_type_left(FILE *h, type_t *t, int declonly) indent(h, -1); fprintf(h, "}"); } - else fprintf(h, "struct %s", t->name); + else fprintf(h, "struct %s", t->name ? t->name : ""); break; case RPC_FC_NON_ENCAPSULATED_UNION: if (!declonly && t->defined && !t->written && !t->ignore) { @@ -244,7 +246,7 @@ void write_type_left(FILE *h, type_t *t, int declonly) indent(h, -1); fprintf(h, "}"); } - else fprintf(h, "union %s", t->name); + else fprintf(h, "union %s", t->name ? t->name : ""); break; case RPC_FC_RP: case RPC_FC_UP: @@ -264,6 +266,8 @@ void write_type_left(FILE *h, type_t *t, int declonly) void write_type_right(FILE *h, type_t *t, int is_field) { + if (!h) return; + if (t->declarray) { if (is_conformant_array(t)) { fprintf(h, "[%s]", is_field ? "1" : ""); @@ -277,6 +281,8 @@ void write_type_right(FILE *h, type_t *t, int is_field) void write_type_v(FILE *h, type_t *t, int is_field, int declonly, const char *fmt, va_list args) { + if (!h) return; + write_type_left(h, t, declonly); if (fmt) { if (needs_space_after(t)) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e3bdd83..a91fd13 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -868,11 +868,18 @@ static unsigned int write_simple_pointer(FILE *file, const type_t *type) return 4; } +static void print_start_tfs_comment(FILE *file, type_t *t, unsigned int tfsoff) +{ + print_file(file, 0, "/* %u (", tfsoff); + write_type_decl(file, t, NULL); + print_file(file, 0, ") */\n"); +} + static size_t write_pointer_tfs(FILE *file, type_t *type, unsigned int *typestring_offset) { unsigned int offset = *typestring_offset; - print_file(file, 0, "/* %d */\n", offset); + print_start_tfs_comment(file, type, offset); update_tfsoff(type, offset, file); if (type->ref->typestring_offset) @@ -904,7 +911,7 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) if (is_base_type(utype->type)) { absoff = *tfsoff; - print_file(file, 0, "/* %d */\n", absoff); + print_start_tfs_comment(file, utype, absoff); print_file(file, 2, "0x%x,\t/* %s */\n", utype->type, string_of_type(utype->type)); print_file(file, 2, "0x5c,\t/* FC_PAD */\n"); *tfsoff += 2; @@ -925,7 +932,7 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) start = *tfsoff; update_tfsoff(type, start, file); - print_file(file, 0, "/* %d */\n", start); + print_start_tfs_comment(file, type, start); print_file(file, 2, "0x%x,\t/* FC_USER_MARSHAL */\n", RPC_FC_USER_MARSHAL); print_file(file, 2, "0x%x,\t/* Alignment= %d, Flags= %02x */\n", flags | (align - 1), align - 1, flags); @@ -1486,7 +1493,7 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type start_offset = *typestring_offset; update_tfsoff(type, start_offset, file); - print_file(file, 0, "/* %lu */\n", start_offset); + print_start_tfs_comment(file, type, start_offset); print_file(file, 2, "0x%02x,\t/* %s */\n", type->type, string_of_type(type->type)); print_file(file, 2, "0x%x,\t/* %d */\n", align - 1, align - 1); *typestring_offset += 2; @@ -1672,7 +1679,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, start_offset = *tfsoff; update_tfsoff(type, start_offset, file); - print_file(file, 0, "/* %d */\n", start_offset); + print_start_tfs_comment(file, type, start_offset); print_file(file, 2, "0x%x,\t/* %s */\n", type->type, string_of_type(type->type)); print_file(file, 2, "0x%x,\t/* %d */\n", align - 1, align - 1); print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", total_size, total_size); @@ -1825,7 +1832,7 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) start_offset = *tfsoff; update_tfsoff(type, start_offset, file); - print_file(file, 0, "/* %d */\n", start_offset); + print_start_tfs_comment(file, type, start_offset); if (type->type == RPC_FC_ENCAPSULATED_UNION) { const var_t *sv = LIST_ENTRY(list_head(type->fields), const var_t, entry); @@ -1926,7 +1933,7 @@ static size_t write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *type, error("%s: interface %s missing UUID\n", __FUNCTION__, base->name); update_tfsoff(type, start_offset, file); - print_file(file, 0, "/* %d */\n", start_offset); + print_start_tfs_comment(file, type, start_offset); print_file(file, 2, "0x2f,\t/* FC_IP */\n"); print_file(file, 2, "0x5a,\t/* FC_CONSTANT_IID */\n"); print_file(file, 2, "NdrFcLong(0x%08lx),\n", uuid->Data1);

1 0

Dan Hipschman : widl: Correct default pointers.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 9650cf9bdbc5eb3aa37f932c51a4e039cce17b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9650cf9bdbc5eb3aa37f932c5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Oct 2 21:41:04 2007 -0700 widl: Correct default pointers. --- tools/widl/parser.y | 44 +++++++++++++++++++++++++++----------------- tools/widl/typegen.c | 42 ++++++++---------------------------------- 2 files changed, 35 insertions(+), 51 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 59bc6e1..8799e89 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -65,6 +65,8 @@ # endif #endif +unsigned char pointer_default = RPC_FC_UP; + typedef struct list typelist_t; struct typenode { type_t *type; @@ -92,7 +94,7 @@ static expr_t *make_expr3(enum expr_type type, expr_t *expr1, expr_t *expr2, exp static type_t *make_type(unsigned char type, type_t *ref); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static array_dims_t *append_array(array_dims_t *list, expr_t *expr); -static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr); +static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr, int top); static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface); static ifref_t *make_ifref(type_t *iface); static var_list_t *append_var(var_list_t *list, var_t *var); @@ -380,21 +382,21 @@ args: arg { check_arg($1); $$ = append_var( NULL, $1 ); } /* split into two rules to get bison to resolve a tVOID conflict */ arg: attributes type pident array { $$ = $3->var; $$->attrs = $1; - set_type($$, $2, $3->ptr_level, $4); + set_type($$, $2, $3->ptr_level, $4, TRUE); free($3); } | type pident array { $$ = $2->var; - set_type($$, $1, $2->ptr_level, $3); + set_type($$, $1, $2->ptr_level, $3, TRUE); free($2); } | attributes type pident '(' m_args ')' { $$ = $3->var; $$->attrs = $1; - set_type($$, $2, $3->ptr_level - 1, NULL); + set_type($$, $2, $3->ptr_level - 1, NULL, TRUE); free($3); $$->args = $5; } | type pident '(' m_args ')' { $$ = $2->var; - set_type($$, $1, $2->ptr_level - 1, NULL); + set_type($$, $1, $2->ptr_level - 1, NULL, TRUE); free($2); $$->args = $4; } @@ -523,7 +525,7 @@ case: tCASE expr ':' field { attr_t *a = make_attrp(ATTR_CASE, append_expr( ; constdef: tCONST type ident '=' expr_const { $$ = reg_const($3); - set_type($$, $2, 0, NULL); + set_type($$, $2, 0, NULL, FALSE); $$->eval = $5; } ; @@ -616,7 +618,7 @@ expr_const: expr { $$ = $1; ; externdef: tEXTERN tCONST type ident { $$ = $4; - set_type($$, $3, 0, NULL); + set_type($$, $3, 0, NULL, FALSE); } ; @@ -632,7 +634,7 @@ field: s_field ';' { $$ = $1; } s_field: m_attributes type pident array { $$ = $3->var; $$->attrs = $1; - set_type($$, $2, $3->ptr_level, $4); + set_type($$, $2, $3->ptr_level, $4, FALSE); free($3); } ; @@ -641,7 +643,7 @@ funcdef: m_attributes type callconv pident '(' m_args ')' { var_t *v = $4->var; v->attrs = $1; - set_type(v, $2, $4->ptr_level, NULL); + set_type(v, $2, $4->ptr_level, NULL, FALSE); free($4); $$ = make_func(v, $6); if (is_attr(v->attrs, ATTR_IN)) { @@ -1262,20 +1264,25 @@ static type_t *make_type(unsigned char type, type_t *ref) return t; } -static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr) +static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr, + int top) { expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS); expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS); - int ptr_type = get_attrv(v->attrs, ATTR_POINTERTYPE); + int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE); + int ptr_type = ptr_attr; int sizeless, has_varconf; expr_t *dim; type_t *atype, **ptype; v->type = type; + if (!ptr_type && top) + ptr_type = RPC_FC_RP; + for ( ; 0 < ptr_level; --ptr_level) { - v->type = make_type(RPC_FC_RP, v->type); + v->type = make_type(pointer_default, v->type); if (ptr_level == 1 && ptr_type && !arr) { v->type->type = ptr_type; @@ -1287,10 +1294,13 @@ static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr) { if (is_ptr(v->type)) { - v->type = duptype(v->type, 1); - v->type->type = ptr_type; + if (v->type->type != ptr_type) + { + v->type = duptype(v->type, 1); + v->type->type = ptr_type; + } } - else if (!arr) + else if (!arr && ptr_attr) error("%s: pointer attribute applied to non-pointer type\n", v->name); } @@ -1504,7 +1514,7 @@ static type_t *make_safearray(type_t *type) { type_t *sa = duptype(find_type("SAFEARRAY", 0), 1); sa->ref = type; - return make_type(RPC_FC_FP, sa); + return make_type(pointer_default, sa); } #define HASHMAX 64 @@ -1628,7 +1638,7 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a int cptr = pident->ptr_level; if (cptr > ptrc) { while (cptr > ptrc) { - cur = ptr = make_type(RPC_FC_RP, cur); + cur = ptr = make_type(pointer_default, cur); ptrc++; } } else { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a91fd13..ba2c983 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1994,24 +1994,10 @@ static size_t write_contexthandle_tfs(FILE *file, const type_t *type, return start_offset; } -static int get_ptr_attr(const type_t *t, int def_type) -{ - while (TRUE) - { - int ptr_attr = get_attrv(t->attrs, ATTR_POINTERTYPE); - if (ptr_attr) - return ptr_attr; - if (t->kind != TKIND_ALIAS) - return def_type; - t = t->orig; - } -} - static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *func, type_t *type, const var_t *var, unsigned int *typeformat_offset) { - int pointer_type; size_t offset; if (is_context_handle(type)) @@ -2023,35 +2009,23 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f return type->typestring_offset; } - if (type == var->type) /* top-level pointers */ - { - int pointer_attr = get_attrv(var->attrs, ATTR_POINTERTYPE); - if (pointer_attr != 0 && !is_ptr(type) && !is_array(type)) - error("'%s': pointer attribute applied to non-pointer type\n", var->name); - - if (pointer_attr == 0) - pointer_attr = get_ptr_attr(type, RPC_FC_RP); - - pointer_type = pointer_attr; - } - else - pointer_type = get_ptr_attr(type, RPC_FC_UP); - if ((last_ptr(type) || last_array(type)) && is_ptrchain_attr(var, ATTR_STRING)) return write_string_tfs(file, var->attrs, type, var->name, typeformat_offset); if (is_array(type)) { + int ptr_type; size_t off; off = write_array_tfs(file, var->attrs, type, var->name, typeformat_offset); - if (pointer_type != RPC_FC_RP) + ptr_type = get_attrv(var->attrs, ATTR_POINTERTYPE); + if (ptr_type && ptr_type != RPC_FC_RP) { unsigned int absoff = type->typestring_offset; short reloff = absoff - (*typeformat_offset + 2); off = *typeformat_offset; print_file(file, 0, "/* %d */\n", off); - print_file(file, 2, "0x%x, 0x0,\t/* %s */\n", pointer_type, - string_of_type(pointer_type)); + print_file(file, 2, "0x%x, 0x0,\t/* %s */\n", ptr_type, + string_of_type(ptr_type)); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", reloff, reloff, absoff); *typeformat_offset += 4; @@ -2101,8 +2075,8 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f if (is_base_type(base->type)) { print_file(file, indent, "0x%x, 0x%x, /* %s %s[simple_pointer] */\n", - pointer_type, (!in_attr && out_attr) ? 0x0C : 0x08, - string_of_type(pointer_type), + type->type, (!in_attr && out_attr) ? 0x0C : 0x08, + string_of_type(type->type), (!in_attr && out_attr) ? "[allocated_on_stack] " : ""); print_file(file, indent, "0x%02x, /* %s */\n", base->type, string_of_type(base->type)); print_file(file, indent, "0x5c, /* FC_PAD */\n"); @@ -2116,7 +2090,7 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f offset = write_typeformatstring_var(file, indent, func, type->ref, var, typeformat_offset); if (file) fprintf(file, "/* %2u */\n", *typeformat_offset); - return write_pointer_only_tfs(file, var->attrs, pointer_type, + return write_pointer_only_tfs(file, var->attrs, type->type, !last_ptr(type) ? 0x10 : 0, offset, typeformat_offset); }

1 0

Jacek Caban : mshtml: Added get_tagName implementation.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 42349000c4a87d3a1c71f107a1119769fbba1bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42349000c4a87d3a1c71f107a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 14:20:34 2007 +0200 mshtml: Added get_tagName implementation. --- dlls/mshtml/htmlelem.c | 20 ++++++++++++++++++-- dlls/mshtml/tests/dom.c | 21 ++++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 77d50b0..609a64d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -279,8 +279,24 @@ static HRESULT WINAPI HTMLElement_get_id(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + const PRUnichar *tag; + nsAString tag_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&tag_str, NULL); + nsres = nsIDOMHTMLElement_GetTagName(This->nselem, &tag_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&tag_str, &tag, NULL); + *p = SysAllocString(tag); + }else { + ERR("GetTagName failed: %08x\n", nsres); + *p = NULL; + } + nsAString_Finish(&tag_str); + + return S_OK; } static HRESULT WINAPI HTMLElement_get_parentElement(IHTMLElement *iface, IHTMLElement **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3c7a18a..fefe054 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -80,11 +80,29 @@ static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) hres = IHTMLDOMNode_get_nodeName(node, &name); IHTMLDOMNode_Release(node); ok_(__FILE__, line) (hres == S_OK, "get_nodeName failed: %08x\n", hres); - ok_(__FILE__, line) (!strcmp_wa(name, exname), "got name: %s, expected HTML\n", dbgstr_w(name)); + ok_(__FILE__, line) (!strcmp_wa(name, exname), "got name: %s, expected %s\n", dbgstr_w(name), exname); SysFreeString(name); } +#define test_elem_tag(u,n) _test_elem_tag(__LINE__,u,n) +static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag) +{ + IHTMLElement *elem; + BSTR tag; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement, (void**)&elem); + ok_(__FILE__, line) (hres == S_OK, "QueryInterface(IID_IHTMLElement) failed: %08x\n", hres); + + hres = IHTMLElement_get_tagName(elem, &tag); + IHTMLElement_Release(elem); + ok_(__FILE__, line) (hres == S_OK, "get_tagName failed: %08x\n", hres); + ok_(__FILE__, line) (!strcmp_wa(tag, extag), "got tag: %s, expected %s\n", dbgstr_w(tag), extag); + + SysFreeString(tag); +} + static void test_doc_elem(IHTMLDocument2 *doc) { IHTMLElement *elem; @@ -99,6 +117,7 @@ static void test_doc_elem(IHTMLDocument2 *doc) ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); test_node_name((IUnknown*)elem, "HTML"); + test_elem_tag((IUnknown*)elem, "HTML"); IHTMLElement_Release(elem); }

1 0

Alexandre Julliard : winenas.drv: Add workaround for INT64 type too.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 1e25c7b5b60e3c1e7a00bdc985b63bf96cad943d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e25c7b5b60e3c1e7a00bdc98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 15:03:07 2007 +0200 winenas.drv: Add workaround for INT64 type too. --- dlls/winenas.drv/audio.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index ad2bfe7..f37ed61 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -56,6 +56,7 @@ #define INT8 X_INT8 #define INT16 X_INT16 #define INT32 X_INT32 +#define INT64 X_INT64 #define BOOL X_BOOL #define BYTE X_BYTE #ifdef HAVE_AUDIO_AUDIOLIB_H @@ -67,6 +68,8 @@ #undef INT8 #undef INT16 #undef INT32 +#undef INT64 +#undef LONG64 #undef BOOL #undef BYTE

1 0