March 2008 - Wine-commits - list.winehq.org

Rob Shearman : widl: Make sure that string types are always written out by write_string_tfs and not write_simple_pointer .
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: f8ea9ec1637a964a067aef6ac0ff9194f61bac20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ea9ec1637a964a067aef6ac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 27 14:05:45 2008 +0000 widl: Make sure that string types are always written out by write_string_tfs and not write_simple_pointer. This is because write_string_tfs has support for the full range of string types, write_simple_pointer doesn't have access to the var attributes which are needed to properly detect strings, and write_string_tfs sets the typestring offset to after the pointer is written and write_remoting_arg depends on this. --- tools/widl/typegen.c | 63 +++++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0c53153..2b0a624 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -58,6 +58,9 @@ static size_t write_struct_tfs(FILE *file, type_t *type, const char *name, unsig static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *type, const char *name, int write_ptr, unsigned int *tfsoff); static const var_t *find_array_or_string_in_struct(const type_t *type); +static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, + type_t *type, + const char *name, unsigned int *typestring_offset); const char *string_of_type(unsigned char type) { @@ -981,27 +984,13 @@ static unsigned int write_nonsimple_pointer(FILE *file, const type_t *type, size return 4; } -static unsigned char conf_string_type_of_char_type(unsigned char t) -{ - switch (t) - { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - return RPC_FC_C_CSTRING; - case RPC_FC_WCHAR: - return RPC_FC_C_WSTRING; - } - - error("string_type_of_char_type: unrecognized type %d\n", t); - return 0; -} - static unsigned int write_simple_pointer(FILE *file, const type_t *type) { - unsigned char fc - = is_string_type(type->attrs, type) - ? conf_string_type_of_char_type(type->ref->type) - : type->ref->type; + unsigned char fc = type->ref->type; + /* for historical reasons, write_simple_pointer also handled string types, + * but no longer does. catch bad uses of the function with this check */ + if (is_string_type(type->attrs, type)) + error("write_simple_pointer: can't handle type %s which is a string type\n", type->name); print_file(file, 2, "0x%02x, 0x8,\t/* %s [simple_pointer] */\n", type->type, string_of_type(type->type)); print_file(file, 2, "0x%02x,\t/* %s */\n", fc, string_of_type(fc)); @@ -1202,7 +1191,12 @@ static int write_no_repeat_pointer_descriptions( *typestring_offset += 6; if (is_ptr(type)) - write_pointer_tfs(file, type, typestring_offset); + { + if (is_string_type(type->attrs, type)) + write_string_tfs(file, NULL, type, NULL, typestring_offset); + else + write_pointer_tfs(file, type, typestring_offset); + } else { unsigned absoff = type->typestring_offset; @@ -1268,7 +1262,9 @@ static int write_pointer_description_offsets( } *typestring_offset += 4; - if (processed(type->ref) || is_base_type(type->ref->type)) + if (is_string_type(attrs, type)) + write_string_tfs(file, NULL, type, NULL, typestring_offset); + else if (processed(type->ref) || is_base_type(type->ref->type)) write_pointer_tfs(file, type, typestring_offset); else error("write_pointer_description_offsets: type format string unknown\n"); @@ -1535,18 +1531,18 @@ int is_declptr(const type_t *t) static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, type_t *type, - const char *name, unsigned int *typestring_offset, - int toplevel) + const char *name, unsigned int *typestring_offset) { size_t start_offset; unsigned char rtype; - if (toplevel && is_declptr(type)) + if (is_declptr(type)) { unsigned char flag = is_conformant_array(type) ? 0 : RPC_FC_P_SIMPLEPOINTER; int pointer_type = is_ptr(type) ? type->type : get_attrv(attrs, ATTR_POINTERTYPE); if (!pointer_type) pointer_type = RPC_FC_RP; + print_start_tfs_comment(file, type, *typestring_offset); print_file(file, 2,"0x%x, 0x%x,\t/* %s%s */\n", pointer_type, flag, string_of_type(pointer_type), flag ? " [simple_pointer]" : ""); @@ -1828,7 +1824,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, if (array && !processed(array->type)) array_offset = is_attr(array->attrs, ATTR_STRING) - ? write_string_tfs(file, array->attrs, array->type, array->name, tfsoff, FALSE) + ? write_string_tfs(file, array->attrs, array->type, array->name, tfsoff) : write_array_tfs(file, array->attrs, array->type, array->name, tfsoff); corroff = *tfsoff; @@ -1891,7 +1887,12 @@ static size_t write_struct_tfs(FILE *file, type_t *type, { type_t *ft = f->type; if (is_ptr(ft)) - write_pointer_tfs(file, ft, tfsoff); + { + if (is_string_type(f->attrs, ft)) + write_string_tfs(file, f->attrs, ft, f->name, tfsoff); + else + write_pointer_tfs(file, ft, tfsoff); + } else if (!ft->declarray && is_conformant_array(ft)) { unsigned int absoff = ft->typestring_offset; @@ -2182,7 +2183,7 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f } if (is_string_type(var->attrs, type)) - return write_string_tfs(file, var->attrs, type, var->name, typeformat_offset, TRUE); + return write_string_tfs(file, var->attrs, type, var->name, typeformat_offset); if (is_array(type)) { @@ -2286,6 +2287,10 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty { write_user_tfs(file, type, tfsoff); } + else if (is_string_type(attrs, type)) + { + write_string_tfs(file, attrs, type, name, tfsoff); + } else if (is_ptr(type)) { type_t *ref = type->ref; @@ -2307,10 +2312,6 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty retmask |= 1; } } - else if (last_array(type) && is_attr(attrs, ATTR_STRING)) - { - write_string_tfs(file, attrs, type, name, tfsoff, FALSE); - } else if (type->declarray && is_conformant_array(type)) ; /* conformant arrays and strings are handled specially */ else if (is_array(type))

1 0

Paul Vriens : setupapi/tests: Add some tests for the last error returned.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 18e305241dcce3f12c25da50f7126a8ffd9cc07a URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e305241dcce3f12c25da50f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Mar 27 12:17:35 2008 +0100 setupapi/tests: Add some tests for the last error returned. --- dlls/setupapi/tests/parser.c | 119 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 119 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 1c3ca49..8b9a520 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -480,6 +480,124 @@ static void test_pSetupGetField(void) SetupCloseInfFile( hinf ); } +static void test_GLE(void) +{ + static const char *inf = + "[Version]\n" + "Signature=\"$Windows NT$\"\n" + "[Sectionname]\n" + "Keyname1=Field1,Field2,Field3\n" + "\n" + "Keyname2=Field4,Field5\n"; + HINF hinf; + UINT err; + INFCONTEXT context; + BOOL retb; + LONG retl; + char buf[MAX_INF_STRING_LENGTH]; + int bufsize = MAX_INF_STRING_LENGTH; + DWORD retsize; + + hinf = test_file_contents( inf, &err ); + ok( hinf != NULL, "Expected valid INF file\n" ); + + SetLastError(0xdeadbeef); + retb = SetupFindFirstLineA( hinf, "ImNotThere", NULL, &context ); + ok(!retb, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_LINE_NOT_FOUND, + "Expected ERROR_LINE_NOT_FOUND, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupFindFirstLineA( hinf, "ImNotThere", "ImNotThere", &context ); + ok(!retb, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_LINE_NOT_FOUND, + "Expected ERROR_LINE_NOT_FOUND, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupFindFirstLineA( hinf, "Sectionname", NULL, &context ); + ok(retb, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupFindFirstLineA( hinf, "Sectionname", "ImNotThere", &context ); + ok(!retb, "Expected failure\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, + "Expected ERROR_LINE_NOT_FOUND, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupFindFirstLineA( hinf, "Sectionname", "Keyname1", &context ); + ok(retb, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupFindNextMatchLineA( &context, "ImNotThere", &context ); + ok(!retb, "Expected failure\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, + "Expected ERROR_LINE_NOT_FOUND, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupFindNextMatchLineA( &context, "Keyname2", &context ); + ok(retb, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retl = SetupGetLineCountA( hinf, "ImNotThere"); + ok(retl == -1, "Expected -1, got %d\n", retl); + ok(GetLastError() == ERROR_SECTION_NOT_FOUND, + "Expected ERROR_SECTION_NOT_FOUND, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retl = SetupGetLineCountA( hinf, "Sectionname"); + ok(retl == 2, "Expected 2, got %d\n", retl); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupGetLineTextA( NULL, hinf, "ImNotThere", "ImNotThere", buf, bufsize, &retsize); + ok(!retb, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_LINE_NOT_FOUND, + "Expected ERROR_LINE_NOT_FOUND, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupGetLineTextA( NULL, hinf, "Sectionname", "ImNotThere", buf, bufsize, &retsize); + ok(!retb, "Expected failure\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, + "Expected ERROR_LINE_NOT_FOUND, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupGetLineTextA( NULL, hinf, "Sectionname", "Keyname1", buf, bufsize, &retsize); + ok(retb, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupGetLineByIndexA( hinf, "ImNotThere", 1, &context ); + ok(!retb, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_LINE_NOT_FOUND, + "Expected ERROR_LINE_NOT_FOUND, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupGetLineByIndexA( hinf, "Sectionname", 1, &context ); + ok(retb, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retb = SetupGetLineByIndexA( hinf, "Sectionname", 3, &context ); + ok(!retb, "Expected failure\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, + "Expected ERROR_LINE_NOT_FOUND, got %08x\n", GetLastError()); + + SetupCloseInfFile( hinf ); +} + START_TEST(parser) { init_function_pointers(); @@ -488,5 +606,6 @@ START_TEST(parser) test_key_names(); test_close_inf_file(); test_pSetupGetField(); + test_GLE(); DeleteFileA( tmpfilename ); }

1 0

Rob Shearman : widl: Add support for generic binding handles.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 59556de0c1b7acb5f62a695b7256debb54c5de8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59556de0c1b7acb5f62a695b7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 27 14:03:17 2008 +0000 widl: Add support for generic binding handles. --- tools/widl/client.c | 32 +++++++++++++++++++++--- tools/widl/header.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/header.h | 3 ++ tools/widl/parser.y | 2 +- tools/widl/widl.c | 1 + tools/widl/widltypes.h | 2 +- 6 files changed, 94 insertions(+), 8 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index eb65d83..47fb25d 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -99,16 +99,21 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const var_t *def = func->def; const var_t* explicit_handle_var; + const var_t* explicit_generic_handle_var = NULL; const var_t* context_handle_var = NULL; int has_full_pointer = is_full_pointer_function(func); /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); if (!explicit_handle_var) - context_handle_var = get_context_handle_var(func); + { + explicit_generic_handle_var = get_explicit_generic_handle_var(func); + if (!explicit_generic_handle_var) + context_handle_var = get_context_handle_var(func); + } if (explicit_handle) { - if (!explicit_handle_var || !context_handle_var) + if (!explicit_handle_var || !explicit_generic_handle_var || !context_handle_var) { error("%s() does not define an explicit binding handle!\n", def->name); return; @@ -148,7 +153,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) fprintf(client, " _RetVal;\n"); } - if (implicit_handle || explicit_handle_var || context_handle_var) + if (implicit_handle || explicit_handle_var || explicit_generic_handle_var || context_handle_var) print_client("RPC_BINDING_HANDLE _Handle = 0;\n"); print_client("RPC_MESSAGE _RpcMessage;\n"); @@ -189,12 +194,20 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_client("_Handle = %s;\n", explicit_handle_var->name); fprintf(client, "\n"); } + else if (explicit_generic_handle_var) + { + print_client("_Handle = %s_bind(%s);\n", + get_explicit_generic_handle_type(explicit_generic_handle_var)->name, + explicit_generic_handle_var->name); + fprintf(client, "\n"); + } else if (context_handle_var) { print_client("if (%s%s != 0)\n", is_ptr(context_handle_var->type) ? "*" : "", context_handle_var->name); indent++; print_client("_Handle = NDRCContextBinding(%s%s);\n", is_ptr(context_handle_var->type) ? "*" : "", context_handle_var->name); indent--; + fprintf(client, "\n"); } write_remoting_arguments(client, indent, func, PASS_IN, PHASE_BUFFERSIZE); @@ -203,7 +216,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); - if (implicit_handle || explicit_handle_var || context_handle_var) + if (implicit_handle || explicit_handle_var || explicit_generic_handle_var || context_handle_var) print_client("_Handle);\n"); else print_client("%s__MIDL_AutoBindHandle);\n", iface->name); @@ -278,6 +291,17 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_client("NdrFreeBuffer((PMIDL_STUB_MESSAGE)&_StubMsg);\n"); + if (!implicit_handle && explicit_generic_handle_var) + { + fprintf(client, "\n"); + print_client("if (_Handle)\n"); + indent++; + print_client("%s_unbind(%s, _Handle);\n", + get_explicit_generic_handle_type(explicit_generic_handle_var)->name, + explicit_generic_handle_var->name); + indent--; + } + indent--; print_client("}\n"); print_client("RpcEndFinally\n"); diff --git a/tools/widl/header.c b/tools/widl/header.c index 5ffa549..f1e5a03 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -34,9 +34,12 @@ #include "parser.h" #include "header.h" +typedef struct _user_type_t generic_handle_t; + static int indentation = 0; user_type_list_t user_type_list = LIST_INIT(user_type_list); static context_handle_list_t context_handle_list = LIST_INIT(context_handle_list); +static struct list generic_handle_list = LIST_INIT(generic_handle_list); static void indent(FILE *h, int delta) { @@ -343,7 +346,18 @@ static int context_handle_registered(const char *name) return 0; } -void check_for_user_types_and_context_handles(const var_list_t *list) +static int generic_handle_registered(const char *name) +{ + generic_handle_t *gh; + LIST_FOR_EACH_ENTRY(gh, &generic_handle_list, generic_handle_t, entry) + if (!strcmp(name, gh->name)) + return 1; + return 0; +} + +/* check for types which require additional prototypes to be generated in the + * header */ +void check_for_additional_prototype_types(const var_list_t *list) { const var_t *v; @@ -365,6 +379,16 @@ void check_for_user_types_and_context_handles(const var_list_t *list) /* don't carry on parsing fields within this type */ break; } + if (type->type != RPC_FC_BIND_PRIMITIVE && is_attr(type->attrs, ATTR_HANDLE)) { + if (!generic_handle_registered(name)) + { + generic_handle_t *gh = xmalloc(sizeof(*gh)); + gh->name = xstrdup(name); + list_add_tail(&generic_handle_list, &gh->entry); + } + /* don't carry on parsing fields within this type */ + break; + } if (is_attr(type->attrs, ATTR_WIREMARSHAL)) { if (!user_type_registered(name)) { @@ -378,7 +402,7 @@ void check_for_user_types_and_context_handles(const var_list_t *list) } else { - check_for_user_types_and_context_handles(type->fields); + check_for_additional_prototype_types(type->fields); } } } @@ -407,6 +431,17 @@ void write_context_handle_rundowns(void) } } +void write_generic_handle_routines(void) +{ + generic_handle_t *gh; + LIST_FOR_EACH_ENTRY(gh, &generic_handle_list, generic_handle_t, entry) + { + const char *name = gh->name; + fprintf(header, "handle_t __RPC_USER %s_bind(%s);\n", name, name); + fprintf(header, "void __RPC_USER %s_unbind(%s, handle_t);\n", name, name); + } +} + void write_typedef(type_t *type) { fprintf(header, "typedef "); @@ -537,6 +572,29 @@ const var_t* get_explicit_handle_var(const func_t* func) return NULL; } +const type_t* get_explicit_generic_handle_type(const var_t* var) +{ + const type_t *t; + for (t = var->type; is_ptr(t); t = t->ref) + if (t->type != RPC_FC_BIND_PRIMITIVE && is_attr(t->attrs, ATTR_HANDLE)) + return t; + return NULL; +} + +const var_t* get_explicit_generic_handle_var(const func_t* func) +{ + const var_t* var; + + if (!func->args) + return NULL; + + LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) + if (get_explicit_generic_handle_type(var)) + return var; + + return NULL; +} + int has_out_arg_or_return(const func_t *func) { const var_t *var; diff --git a/tools/widl/header.h b/tools/widl/header.h index 173bd03..3f4fee2 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -62,7 +62,10 @@ extern void write_externdef(const var_t *v); extern void write_library(const char *name, const attr_list_t *attr); extern void write_user_types(void); extern void write_context_handle_rundowns(void); +extern void write_generic_handle_routines(void); extern const var_t* get_explicit_handle_var(const func_t* func); +extern const type_t* get_explicit_generic_handle_type(const var_t* var); +extern const var_t* get_explicit_generic_handle_var(const func_t* func); extern int has_out_arg_or_return(const func_t *func); extern void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3a89723..a4f383f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2072,7 +2072,7 @@ static void check_all_user_types(ifref_list_t *ifrefs) { const func_list_t *fs = ifref->iface->funcs; if (fs) LIST_FOR_EACH_ENTRY(f, fs, const func_t, entry) - check_for_user_types_and_context_handles(f->args); + check_for_additional_prototype_types(f->args); } } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index bb3f651..13daf7e 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -601,6 +601,7 @@ int main(int argc,char *argv[]) fprintf(header, "/* Begin additional prototypes for all interfaces */\n"); fprintf(header, "\n"); write_user_types(); + write_generic_handle_routines(); write_context_handle_rundowns(); fprintf(header, "\n"); fprintf(header, "/* End additional prototypes */\n"); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index acdc3f1..7eaacd1 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -312,7 +312,7 @@ struct _user_type_t { extern unsigned char pointer_default; extern user_type_list_t user_type_list; -void check_for_user_types_and_context_handles(const var_list_t *list); +void check_for_additional_prototype_types(const var_list_t *list); void init_types(void); type_t *alloc_type(void);

1 0

Rob Shearman : widl: Fix detection of non-pointer context handles.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: f4a96193645ac2af81ab4ee7d6033e1426a37897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a96193645ac2af81ab4ee7d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 27 14:03:23 2008 +0000 widl: Fix detection of non-pointer context handles. is_ptr cannot be used because it follows the chain of types into the type which has the context_handle attribute, which is typically "void *" and so causes these context handles to be incorrectly detected as context handles. Instead, we can use is_aliaschain_ptr to follow the chain of aliases without following pointers and the absence of the context_handle attribute indicates that it must be present on a type after following a pointer. --- tools/widl/client.c | 8 ++++++-- tools/widl/server.c | 6 +++++- tools/widl/typegen.c | 6 +++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 47fb25d..7f2a806 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -203,9 +203,13 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) } else if (context_handle_var) { - print_client("if (%s%s != 0)\n", is_ptr(context_handle_var->type) ? "*" : "", context_handle_var->name); + /* if the context_handle attribute appears in the chain of types + * without pointers being followed, then the context handle must + * be direct, otherwise it is a pointer */ + int is_ch_ptr = is_aliaschain_attr(context_handle_var->type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; + print_client("if (%s%s != 0)\n", is_ch_ptr ? "*" : "", context_handle_var->name); indent++; - print_client("_Handle = NDRCContextBinding(%s%s);\n", is_ptr(context_handle_var->type) ? "*" : "", context_handle_var->name); + print_client("_Handle = NDRCContextBinding(%s%s);\n", is_ch_ptr ? "*" : "", context_handle_var->name); indent--; fprintf(client, "\n"); } diff --git a/tools/widl/server.c b/tools/widl/server.c index 8203396..a81c602 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -184,9 +184,13 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) fprintf(server, ",\n"); if (is_context_handle(var->type)) { + /* if the context_handle attribute appears in the chain of types + * without pointers being followed, then the context handle must + * be direct, otherwise it is a pointer */ + int is_ch_ptr = is_aliaschain_attr(var->type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; print_server("("); write_type_decl_left(server, var->type); - fprintf(server, ")%sNDRSContextValue(%s)", is_ptr(var->type) ? "" : "*", var->name); + fprintf(server, ")%sNDRSContextValue(%s)", is_ch_ptr ? "" : "*", var->name); } else { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4e5782b..0c53153 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2778,9 +2778,13 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, { if (pass == PASS_IN) { + /* if the context_handle attribute appears in the chain of types + * without pointers being followed, then the context handle must + * be direct, otherwise it is a pointer */ + int is_ch_ptr = is_aliaschain_attr(type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; print_file(file, indent, "NdrClientContextMarshall(\n"); print_file(file, indent + 1, "&_StubMsg,\n"); - print_file(file, indent + 1, "(NDR_CCONTEXT)%s%s,\n", is_ptr(type) ? "*" : "", var->name); + print_file(file, indent + 1, "(NDR_CCONTEXT)%s%s,\n", is_ch_ptr ? "*" : "", var->name); print_file(file, indent + 1, "%s);\n", in_attr && out_attr ? "1" : "0"); } else

1 0

Rob Shearman : widl: Use is_string_type for detecting strings in write_typeformatstring_var to make it consistent with write_remoting_arg .
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 8a0cb2b5c587ced1092346bebb58820c30122375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0cb2b5c587ced1092346beb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 27 14:02:58 2008 +0000 widl: Use is_string_type for detecting strings in write_typeformatstring_var to make it consistent with write_remoting_arg. Fix the is_string_type function used for detecting strings by only examining aliases instead of both aliases and pointers. This is due to the requirement that pointers to strings be handled as pointers and so not detected as strings. --- tools/widl/header.c | 13 +++++++++++++ tools/widl/header.h | 3 ++- tools/widl/typegen.c | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 0a28fd9..5ffa549 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -66,6 +66,19 @@ int is_ptrchain_attr(const var_t *var, enum attr_type t) } } +int is_aliaschain_attr(const type_t *type, enum attr_type attr) +{ + const type_t *t = type; + for (;;) + { + if (is_attr(t->attrs, attr)) + return 1; + else if (t->kind == TKIND_ALIAS) + t = t->orig; + else return 0; + } +} + int is_attr(const attr_list_t *list, enum attr_type t) { const attr_t *attr; diff --git a/tools/widl/header.h b/tools/widl/header.h index 656d4b2..173bd03 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -24,6 +24,7 @@ #include "widltypes.h" extern int is_ptrchain_attr(const var_t *var, enum attr_type t); +extern int is_aliaschain_attr(const type_t *var, enum attr_type t); extern int is_attr(const attr_list_t *list, enum attr_type t); extern void *get_attrp(const attr_list_t *list, enum attr_type t); extern unsigned long get_attrv(const attr_list_t *list, enum attr_type t); @@ -78,7 +79,7 @@ static inline int last_array(const type_t *type) static inline int is_string_type(const attr_list_t *attrs, const type_t *type) { - return ((is_attr(attrs, ATTR_STRING) || is_attr(type->attrs, ATTR_STRING)) + return ((is_attr(attrs, ATTR_STRING) || is_aliaschain_attr(type, ATTR_STRING)) && (last_ptr(type) || last_array(type))); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ae23f94..4e5782b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2181,7 +2181,7 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f return type->typestring_offset; } - if ((last_ptr(type) || last_array(type)) && is_ptrchain_attr(var, ATTR_STRING)) + if (is_string_type(var->attrs, type)) return write_string_tfs(file, var->attrs, type, var->name, typeformat_offset, TRUE); if (is_array(type))

1 0

Alexandre Julliard : winetest: Add the Wine build id to the version information.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: dfd6c1f21abd0cf1a8e757eb93b7ce9394582220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd6c1f21abd0cf1a8e757eb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 27 16:47:31 2008 +0100 winetest: Add the Wine build id to the version information. --- programs/winetest/main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 41879b4..c134f93 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -132,6 +132,7 @@ static void print_version (void) OSVERSIONINFOEX ver; BOOL ext; int is_win2k3_r2; + const char *(*wine_get_build_id)(void); ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); if (!(ext = GetVersionEx ((OSVERSIONINFO *) &ver))) @@ -148,6 +149,9 @@ static void print_version (void) ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, ver.dwPlatformId, ver.szCSDVersion); + wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); + if (wine_get_build_id) xprintf( " WineBuild=%s\n", wine_get_build_id() ); + is_win2k3_r2 = GetSystemMetrics(SM_SERVERR2); if(is_win2k3_r2) xprintf(" R2 build number=%d\n", is_win2k3_r2);

1 0

Alexandre Julliard : winetest: Use the HEAD commit sha1 as default build id .
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 4e665b1e21ae63f33d0214f677da39373eafcaf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e665b1e21ae63f33d0214f67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 27 17:26:20 2008 +0100 winetest: Use the HEAD commit sha1 as default build id. --- programs/winetest/Makefile.in | 2 ++ programs/winetest/main.c | 4 +++- programs/winetest/resource.h | 2 ++ programs/winetest/winetest.rc | 7 +++++++ 4 files changed, 14 insertions(+), 1 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 4552284..86a176e 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -6,6 +6,8 @@ MODULE = winetest.exe APPMODE = -mconsole IMPORTS = comctl32 version user32 gdi32 advapi32 wsock32 kernel32 +EXTRARCFLAGS = -DBUILD_SHA1=\"$$(GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null)\" + C_SRCS = \ gui.c \ main.c \ diff --git a/programs/winetest/main.c b/programs/winetest/main.c index c134f93..72b7442 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -501,6 +501,7 @@ run_tests (char *logname) int logfile; char *strres, *eol, *nextline; DWORD strsize; + char build[64]; SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); @@ -539,7 +540,8 @@ run_tests (char *logname) xprintf ("Version 4\n"); strres = extract_rcdata (MAKEINTRESOURCE(WINE_BUILD), STRINGRES, &strsize); xprintf ("Tests from build "); - if (strres) xprintf ("%.*s", strsize, strres); + if (LoadStringA( 0, IDS_BUILD_ID, build, sizeof(build) )) xprintf( "%s\n", build ); + else if (strres) xprintf ("%.*s", strsize, strres); else xprintf ("-\n"); strres = extract_rcdata (MAKEINTRESOURCE(TESTS_URL), STRINGRES, &strsize); xprintf ("Archive: "); diff --git a/programs/winetest/resource.h b/programs/winetest/resource.h index 61fe35c..a40c089 100644 --- a/programs/winetest/resource.h +++ b/programs/winetest/resource.h @@ -42,6 +42,8 @@ #define IDC_EDIT 4000 #define IDC_ABOUT 4001 +#define IDS_BUILD_ID 1 + /* Resource types */ #define TESTRES 1000 diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 2a70931..951b923 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -24,6 +24,13 @@ #include "resource.h" +#ifdef BUILD_SHA1 +STRINGTABLE +BEGIN + IDS_BUILD_ID BUILD_SHA1 +END +#endif + IDD_TAG DIALOG 0, 0, 150, 65 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "No tag supplied"

1 0

Alexandre Julliard : winefile: Remove some unused resources.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 0b98d108bcc03fc02cca53e330929cc03bb5dc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b98d108bcc03fc02cca53e33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 27 13:46:04 2008 +0100 winefile: Remove some unused resources. --- programs/winefile/De.rc | 27 --------------------------- programs/winefile/En.rc | 26 +------------------------- programs/winefile/Es.rc | 24 ------------------------ programs/winefile/Fr.rc | 27 --------------------------- programs/winefile/Ko.rc | 25 ------------------------- programs/winefile/Nl.rc | 24 ------------------------ programs/winefile/No.rc | 24 ------------------------ programs/winefile/Pl.rc | 24 ------------------------ programs/winefile/Ru.rc | 24 ------------------------ programs/winefile/resource.h | 7 ------- programs/winefile/winefile.c | 24 ------------------------ 11 files changed, 1 insertions(+), 255 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b98d108bcc03fc02cca5…

1 0

Alexandre Julliard : user32: Cosmetic fixes to the About dialog.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 7dfc5184e05816d3787e9229deaa03f8da746f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfc5184e05816d3787e9229d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 27 13:47:57 2008 +0100 user32: Cosmetic fixes to the About dialog. --- dlls/user32/nonclient.c | 2 +- dlls/user32/resources/user32_Bg.rc | 2 +- dlls/user32/resources/user32_Ca.rc | 2 +- dlls/user32/resources/user32_Cs.rc | 2 +- dlls/user32/resources/user32_Da.rc | 2 +- dlls/user32/resources/user32_De.rc | 2 +- dlls/user32/resources/user32_En.rc | 2 +- dlls/user32/resources/user32_Eo.rc | 2 +- dlls/user32/resources/user32_Es.rc | 2 +- dlls/user32/resources/user32_Fi.rc | 2 +- dlls/user32/resources/user32_Hu.rc | 2 +- dlls/user32/resources/user32_It.rc | 2 +- dlls/user32/resources/user32_Nl.rc | 2 +- dlls/user32/resources/user32_No.rc | 2 +- dlls/user32/resources/user32_Pl.rc | 2 +- dlls/user32/resources/user32_Pt.rc | 4 ++-- dlls/user32/resources/user32_Ru.rc | 2 +- dlls/user32/resources/user32_Si.rc | 2 +- dlls/user32/resources/user32_Sk.rc | 2 +- dlls/user32/resources/user32_Sv.rc | 2 +- dlls/user32/resources/user32_Tr.rc | 2 +- dlls/user32/resources/user32_Uk.rc | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dfc5184e05816d3787e9…

1 0

Alexandre Julliard : winefile: Remove redundant About Wine menu option.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 761ce98b3f028a61ed2d3671274bf6529ad6f592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761ce98b3f028a61ed2d36712… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 27 13:36:39 2008 +0100 winefile: Remove redundant About Wine menu option. --- programs/winefile/Cs.rc | 4 ---- programs/winefile/De.rc | 4 ---- programs/winefile/En.rc | 6 +----- programs/winefile/Es.rc | 4 ---- programs/winefile/Fr.rc | 4 ---- programs/winefile/Hu.rc | 3 --- programs/winefile/It.rc | 3 --- programs/winefile/Ko.rc | 4 ---- programs/winefile/Nl.rc | 4 ---- programs/winefile/No.rc | 4 ---- programs/winefile/Pl.rc | 4 ---- programs/winefile/Pt.rc | 8 -------- programs/winefile/Ru.rc | 4 ---- programs/winefile/Si.rc | 3 --- programs/winefile/Sv.rc | 4 ---- programs/winefile/Tr.rc | 4 ---- programs/winefile/Zh.rc | 3 --- programs/winefile/resource.h | 4 +--- programs/winefile/winefile.c | 8 -------- programs/winefile/winefile.h | 4 ---- 20 files changed, 2 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=761ce98b3f028a61ed2d3…

1 0