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

Rob Shearman : widl: Stop looping in check_remoting_args when a context_handle or wire_marshal type is found as they are in effect fundamental types .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 6e27e7840f49253f068fb175faf25e42a949ad77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e27e7840f49253f068fb175f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:06 2008 +0100 widl: Stop looping in check_remoting_args when a context_handle or wire_marshal type is found as they are in effect fundamental types. --- tools/widl/parser.y | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 45471bb..d4ba87a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2376,9 +2376,15 @@ static void check_remoting_args(const func_t *func) for (;;) { if (!is_wire_marshal && is_attr(type->attrs, ATTR_WIREMARSHAL)) + { is_wire_marshal = 1; + break; + } if (!is_context_handle && is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + { is_context_handle = 1; + break; + } if (type->kind == TKIND_ALIAS) type = type->orig; else if (is_ptr(type))

1 0

Rob Shearman : widl: Check that fields in structures and unions referenced by non-local functions can be marshalled and that their attributes are consistent .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 15612e60fd20138baa0fe20c24ff3f2c447ad40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15612e60fd20138baa0fe20c2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:16 2008 +0100 widl: Check that fields in structures and unions referenced by non-local functions can be marshalled and that their attributes are consistent. --- tools/widl/parser.y | 95 +++++++++++++++++++++++++++++++++++++++++------- tools/widl/widltypes.h | 1 + 2 files changed, 82 insertions(+), 14 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d4ba87a..4d04546 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1352,6 +1352,7 @@ static type_t *make_type(unsigned char type, type_t *ref) t->written = FALSE; t->user_types_registered = FALSE; t->tfswrite = FALSE; + t->checked = FALSE; t->typelib_idx = -1; return t; } @@ -2359,6 +2360,83 @@ static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_ return attrs; } +static void check_remoting_fields(type_t *type); + +/* checks that properties common to fields and arguments are consistent */ +static void check_field_common(const char *container_type, + const char *container_name, const var_t *arg) +{ + type_t *type = arg->type; + int is_wire_marshal = 0; + int is_context_handle = 0; + + if (is_attr(arg->attrs, ATTR_LENGTHIS) && + (is_attr(arg->attrs, ATTR_STRING) || is_aliaschain_attr(arg->type, ATTR_STRING))) + error_loc_info(&arg->loc_info, + "string and length_is specified for argument %s are mutually exclusive attributes\n", + arg->name); + + /* get fundamental type for the argument */ + for (;;) + { + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) + { + is_wire_marshal = 1; + break; + } + if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + { + is_context_handle = 1; + break; + } + if (type->kind == TKIND_ALIAS) + type = type->orig; + else if (is_ptr(type) || is_array(type)) + type = type->ref; + else + break; + } + + if (type->type == 0 && !is_attr(arg->attrs, ATTR_IIDIS) && !is_wire_marshal && !is_context_handle) + error_loc_info(&arg->loc_info, "parameter \'%s\' of %s \'%s\' cannot derive from void *\n", arg->name, container_type, container_name); + else if (type->type == RPC_FC_FUNCTION) + error_loc_info(&arg->loc_info, "parameter \'%s\' of %s \'%s\' cannot be a function pointer\n", arg->name, container_type, container_name); + else if (!is_wire_marshal && (is_struct(type->type) || is_union(type->type))) + check_remoting_fields(type); +} + +static void check_remoting_fields(type_t *type) +{ + const char *container_type = NULL; + const var_t *field; + const var_list_t *fields = NULL; + + if (type->checked) + return; + + type->checked = TRUE; + + if (is_struct(type->type)) + { + fields = type->fields_or_args; + container_type = "structure"; + } + else if (is_union(type->type)) + { + if (type->type == RPC_FC_ENCAPSULATED_UNION) + { + const var_t *uv = LIST_ENTRY(list_tail(type->fields_or_args), const var_t, entry); + fields = uv->type->fields_or_args; + } + else + fields = type->fields_or_args; + container_type = "union"; + } + + if (fields) LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) + if (field->type) check_field_common(container_type, type->name, field); +} + /* checks that arguments for a function make sense for marshalling and unmarshalling */ static void check_remoting_args(const func_t *func) { @@ -2369,22 +2447,14 @@ static void check_remoting_args(const func_t *func) { int ptr_level = 0; const type_t *type = arg->type; - int is_wire_marshal = 0; - int is_context_handle = 0; /* get pointer level and fundamental type for the argument */ for (;;) { - if (!is_wire_marshal && is_attr(type->attrs, ATTR_WIREMARSHAL)) - { - is_wire_marshal = 1; + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) break; - } - if (!is_context_handle && is_attr(type->attrs, ATTR_CONTEXTHANDLE)) - { - is_context_handle = 1; + if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) break; - } if (type->kind == TKIND_ALIAS) type = type->orig; else if (is_ptr(type)) @@ -2408,10 +2478,7 @@ static void check_remoting_args(const func_t *func) } } - if (type->type == 0 && !is_attr(arg->attrs, ATTR_IIDIS) && !is_wire_marshal && !is_context_handle) - error_loc_info(&arg->loc_info, "parameter \'%s\' of function \'%s\' cannot derive from void *\n", arg->name, funcname); - else if (type->type == RPC_FC_FUNCTION) - error_loc_info(&arg->loc_info, "parameter \'%s\' of function \'%s\' cannot be a function pointer\n", arg->name, funcname); + check_field_common("function", funcname, arg); } } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 89d593a..dfae4dd 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -239,6 +239,7 @@ struct _type_t { unsigned int written : 1; unsigned int user_types_registered : 1; unsigned int tfswrite : 1; /* if the type needs to be written to the TFS */ + unsigned int checked : 1; int sign : 2; };

1 0

Rob Shearman : widl: The implicit_handle attribute is allowed with a handle explicitly specified in the function parameters .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c4ca32bbdafb87a01ca6047ca033bde32859f8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ca32bbdafb87a01ca6047ca… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:24 2008 +0100 widl: The implicit_handle attribute is allowed with a handle explicitly specified in the function parameters. In that case, that handle is used instead of the implicit handle. Fix the check for the explicit_handle attribute being specified without a handle being specified in the function parameters, even though issuing an error is wrong. (Thanks to Marcus Meissner & Coverity for spotting that the check didn't do what it was supposed to do.) --- tools/widl/client.c | 31 ++++++++++--------------------- tools/widl/header.c | 19 ------------------- tools/widl/server.c | 18 ------------------ 3 files changed, 10 insertions(+), 58 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index eb1ade2..b3f89a7 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -110,22 +110,11 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { 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 || !explicit_generic_handle_var || !context_handle_var) { - error("%s() does not define an explicit binding handle!\n", def->name); - return; - } - } - else if (implicit_handle) - { - if (explicit_handle_var) - { - error("%s() must not define a binding handle!\n", def->name); - return; + context_handle_var = get_context_handle_var(func); + if (!context_handle_var && explicit_handle) + /* FIXME: should use automatically added IDL_handle parameter */ + error("explicit_handle attribute specified and %s() does not define an explicit binding handle - not implemented yet\n", def->name); } } @@ -196,12 +185,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) fprintf(client, ");\n\n"); } - if (implicit_handle) - { - print_client("_Handle = %s;\n", implicit_handle); - fprintf(client, "\n"); - } - else if (explicit_handle_var) + if (explicit_handle_var) { print_client("_Handle = %s;\n", explicit_handle_var->name); fprintf(client, "\n"); @@ -225,6 +209,11 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) indent--; fprintf(client, "\n"); } + else if (implicit_handle) + { + print_client("_Handle = %s;\n", implicit_handle); + fprintf(client, "\n"); + } write_remoting_arguments(client, indent, func, PASS_IN, PHASE_BUFFERSIZE); diff --git a/tools/widl/header.c b/tools/widl/header.c index dcc3480..8668ce9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -896,31 +896,12 @@ static void write_function_proto(const type_t *iface, const func_t *fun, const c static void write_function_protos(const type_t *iface) { - const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); - const var_t* explicit_handle_var; const func_t *cur; int prefixes_differ = strcmp(prefix_client, prefix_server); if (!iface->funcs) return; LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) { - var_t *def = cur->def; - - /* check for a defined binding handle */ - explicit_handle_var = get_explicit_handle_var(cur); - if (explicit_handle) { - if (!explicit_handle_var) { - error("%s() does not define an explicit binding handle!\n", def->name); - return; - } - } else if (implicit_handle) { - if (explicit_handle_var) { - error("%s() must not define a binding handle!\n", def->name); - return; - } - } - if (prefixes_differ) { fprintf(header, "/* client prototype */\n"); write_function_proto(iface, cur, prefix_client); diff --git a/tools/widl/server.c b/tools/widl/server.c index 2efb712..bb16c54 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -50,8 +50,6 @@ static void print_server(const char *format, ...) static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { - char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); const func_t *func; const var_t *var; const var_t* explicit_handle_var; @@ -64,22 +62,6 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); - if (explicit_handle) - { - if (!explicit_handle_var) - { - error("%s() does not define an explicit binding handle!\n", def->name); - return; - } - } - else if (implicit_handle) - { - if (explicit_handle_var) - { - error("%s() must not define a binding handle!\n", def->name); - return; - } - } fprintf(server, "void __RPC_STUB\n"); fprintf(server, "%s_", iface->name);

1 0

Rob Shearman : widl: Automatically add "handle_t IDL_handle" parameter to functions with no explicit handle specified whose containing interface has the explicit_handle attribute .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c46fcfb356b31431cc34de1f9c6a7599db317abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46fcfb356b31431cc34de1f9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:29 2008 +0100 widl: Automatically add "handle_t IDL_handle" parameter to functions with no explicit handle specified whose containing interface has the explicit_handle attribute. --- tools/widl/client.c | 20 -------------------- tools/widl/header.c | 14 ++++++++++++++ tools/widl/header.h | 1 + tools/widl/parser.y | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 20 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index b3f89a7..d15dfdc 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -70,25 +70,10 @@ static void check_pointers(const func_t *func) } } -const var_t* get_context_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 (is_attr(var->attrs, ATTR_IN) && is_context_handle(var->type)) - return var; - - return NULL; -} - static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const func_t *func; const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); const var_t *var; int method_count = 0; @@ -110,12 +95,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { explicit_generic_handle_var = get_explicit_generic_handle_var(func); if (!explicit_generic_handle_var) - { context_handle_var = get_context_handle_var(func); - if (!context_handle_var && explicit_handle) - /* FIXME: should use automatically added IDL_handle parameter */ - error("explicit_handle attribute specified and %s() does not define an explicit binding handle - not implemented yet\n", def->name); - } } write_type_decl_left(client, get_func_return_type(func)); diff --git a/tools/widl/header.c b/tools/widl/header.c index 8668ce9..3c89d61 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -618,6 +618,20 @@ const var_t* get_explicit_generic_handle_var(const func_t* func) return NULL; } +const var_t* get_context_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 (is_attr(var->attrs, ATTR_IN) && is_context_handle(var->type)) + 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 3f4fee2..e8fdbc9 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -66,6 +66,7 @@ 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 const var_t* get_context_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 4d04546..6f5dbdd 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -142,6 +142,7 @@ static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); static const attr_list_t *check_module_attrs(const char *name, const attr_list_t *attrs); static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); +static void add_explicit_handle_if_necessary(func_t *func); #define tsENUM 1 #define tsSTRUCT 2 @@ -2482,8 +2483,48 @@ static void check_remoting_args(const func_t *func) } } +static void add_explicit_handle_if_necessary(func_t *func) +{ + const var_t* explicit_handle_var; + const var_t* explicit_generic_handle_var = NULL; + const var_t* context_handle_var = NULL; + + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(func); + if (!explicit_handle_var) + { + explicit_generic_handle_var = get_explicit_generic_handle_var(func); + if (!explicit_generic_handle_var) + { + context_handle_var = get_context_handle_var(func); + if (!context_handle_var) + { + /* no explicit handle specified so add + * "[in] handle_t IDL_handle" as the first parameter to the + * function */ + var_t *idl_handle = make_var(xstrdup("IDL_handle")); + idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); + idl_handle->type = find_type("handle_t", 0); + if (!func->def->type->fields_or_args) + { + func->def->type->fields_or_args = xmalloc( sizeof(*func->def->type->fields_or_args) ); + list_init( func->def->type->fields_or_args ); + } + list_add_head( func->def->type->fields_or_args, &idl_handle->entry ); + func->args = func->def->type->fields_or_args; + } + } + } +} + static void check_functions(const type_t *iface) { + if (is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE) && iface->funcs) + { + func_t *func; + LIST_FOR_EACH_ENTRY( func, iface->funcs, func_t, entry ) + add_explicit_handle_if_necessary(func); + } if (!is_inside_library && !is_attr(iface->attrs, ATTR_LOCAL)) { const func_t *func;

1 0

James Hawkins : imm32: Fix a test that fails on all systems.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 8422c98df76c6e1eff26037df69d28b4ae084b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8422c98df76c6e1eff26037df… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 20:49:44 2008 -0500 imm32: Fix a test that fails on all systems. --- dlls/imm32/tests/imm32.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d948f54..a5d09ca 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -177,12 +177,16 @@ static int test_ImmNotifyIME(void) { static const char string[] = "wine"; char resstr[16] = ""; HIMC imc; + BOOL ret; imc = ImmGetContext(hwnd); msg_spy_flush_msgs(); - ok(ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " - "empty composition string succeeds.\n"); + todo_wine + { + ok(!ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " + "empty composition string should fail.\n"); + } ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); @@ -191,16 +195,24 @@ static int test_ImmNotifyIME(void) { ImmSetCompositionString(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); - ok(msg_spy_find_msg(WM_IME_COMPOSITION) != NULL, "Windows does post " - "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " - "the composition string being canceled is non empty.\n"); - ok(!ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr)), - "After being canceled the composition string is empty.\n"); + todo_wine + { + ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " + "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " + "the composition string being canceled is non empty.\n"); + } + + /* behavior differs between win9x and NT */ + ret = ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr)); + ok(ret || !ret, "You'll never read this.\n"); msg_spy_flush_msgs(); - ok(ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " - "empty composition string succeeds.\n"); + todo_wine + { + ok(!ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " + "empty composition string should fail.\n"); + } ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n");

1 0

James Hawkins : kernel32: Fix two tests that fail in win9x.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 603822ca8bacb75bf69caffce0ce375c4a0893a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=603822ca8bacb75bf69caffce… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 15:40:25 2008 -0500 kernel32: Fix two tests that fail in win9x. --- dlls/kernel32/tests/change.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 7c90ccd..cdba120 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -98,7 +98,9 @@ static void test_FindFirstChangeNotification(void) /* pathetic checks */ change = FindFirstChangeNotificationA("not-a-file", FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); - ok(change == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND, + ok(change == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", change); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_NO_MORE_FILES, /* win95 */ "FindFirstChangeNotification error: %d\n", GetLastError()); if (0) /* This documents win2k behavior. It crashes on win98. */ @@ -152,17 +154,15 @@ static void test_FindFirstChangeNotification(void) thread = StartNotificationThread(dirname1, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = MoveFileA(dirname1, dirname2); ok(ret, "MoveFileA error: %d\n", GetLastError()); - ret = FinishNotificationThread(thread); - ok(!ret, "Unexpected notification\n"); + /* win9x and win2k behave differently here, don't check result */ + FinishNotificationThread(thread); /* What if we remove the directory we registered notification for? */ thread = StartNotificationThread(dirname2, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = RemoveDirectoryA(dirname2); ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); - - /* win98 and win2k behave differently here */ - ret = FinishNotificationThread(thread); - ok(ret || !ret, "You'll never read this\n"); + /* win9x and win2k behave differently here, don't check result */ + FinishNotificationThread(thread); /* functional checks */

1 0

James Hawkins : kernel32: Fix a test that fails in win9x.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 99949cb21a3c2ee413cfb6eb9002209fecb5e88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99949cb21a3c2ee413cfb6eb9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 15:33:27 2008 -0500 kernel32: Fix a test that fails in win9x. --- dlls/kernel32/tests/atom.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index 2977416..fcf60e2 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -222,7 +222,9 @@ static void test_get_atom_name(void) memset( buf, '.', sizeof(buf) ); len = GlobalGetAtomNameA( atom, buf, 6 ); - ok( len == 0, "bad length %d\n", len ); + ok( len == 0 || + len == 5, /* win9x */ + "bad length %d\n", len ); ok( !memcmp( buf, "fooba\0....", 10 ), "bad buffer contents\n"); if (unicode_OS) {

1 0

James Hawkins : advapi32: Fix a test that fails in win2k3.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: d3bbc0231a9a90fa0f29ca1569aaeab5de160555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bbc0231a9a90fa0f29ca156… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 03:00:42 2008 -0500 advapi32: Fix a test that fails in win2k3. --- dlls/advapi32/tests/registry.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 5d86d9b..e027a97 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -786,9 +786,13 @@ static void test_get_value(void) ret = pRegGetValueA(hkey_main, NULL, "TP1_ZB_SZ", RRF_RT_REG_SZ, &type, buf, &size); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); /* v5.2.3790.1830 (2003 SP1) returns sTestpath1 length + 2 here. */ - ok(size == 0, "size=%d\n", size); + ok(size == 0 || + size == 1, /* win2k3 */ + "size=%d\n", size); ok(type == REG_SZ, "type=%d\n", type); - ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); + ok(!strcmp(sTestpath1, buf) || + !strcmp(buf, ""), + "Expected \"%s\" or \"\", got \"%s\"\n", sTestpath1, buf); /* Query REG_SZ using RRF_RT_REG_SZ|RRF_NOEXPAND (ok) */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf);

1 0

James Hawkins : msi: Fix a few tests that fail in win9x.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a5d15b3b609625ba3b55573d256a6a0f31611b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d15b3b609625ba3b55573d2… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Apr 20 03:07:15 2008 -0500 msi: Fix a few tests that fail in win9x. --- dlls/msi/tests/install.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a85cdd4..fac57c3 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1956,8 +1956,9 @@ static void test_concurrentinstall(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + if (!delete_pf("msitest\\augustus", TRUE)) + trace("concurrent installs not supported\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); DeleteFile(path); @@ -1978,6 +1979,10 @@ static void test_concurrentinstall(void) static void test_setpropertyfolder(void) { UINT r; + CHAR path[MAX_PATH]; + + lstrcpyA(path, PROG_FILES_DIR); + lstrcatA(path, "\\msitest\\added"); CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500); @@ -1988,9 +1993,18 @@ static void test_setpropertyfolder(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + if (GetFileAttributesA(path) == FILE_ATTRIBUTE_DIRECTORY) + { + ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + } + else + { + trace("changing folder property not supported\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + } /* Delete the files in the temp (current) folder */ DeleteFile(msifile);

1 0

Maarten Lankhorst : dsound: Skip the sound checks on the primary module and change its driver module to "".
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 6c4d9448a9d25b693693912bcb3ab0cf4274d7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4d9448a9d25b693693912bc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 19 22:01:36 2008 -0700 dsound: Skip the sound checks on the primary module and change its driver module to "". --- dlls/dsound/dsound_main.c | 9 ++++----- dlls/dsound/tests/dsound.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index d7c50b8..31078cb 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -311,8 +311,8 @@ HRESULT WINAPI DirectSoundEnumerateA( err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n", - "Primary Sound Driver",desc.szDrvname,lpContext); - if (lpDSEnumCallback(NULL, "Primary Sound Driver", desc.szDrvname, lpContext) == FALSE) + "Primary Sound Driver","",lpContext); + if (lpDSEnumCallback(NULL, "Primary Sound Driver", "", lpContext) == FALSE) return DS_OK; } } @@ -367,6 +367,7 @@ HRESULT WINAPI DirectSoundEnumerateW( devs = waveOutGetNumDevs(); if (devs > 0) { if (GetDeviceID(&DSDEVID_DefaultPlayback, &guid) == DS_OK) { + static const WCHAR empty[] = { 0 }; for (wod = 0; wod < devs; ++wod) { if (IsEqualGUID( &guid, &DSOUND_renderer_guids[wod] ) ) { err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); @@ -375,9 +376,7 @@ HRESULT WINAPI DirectSoundEnumerateW( "Primary Sound Driver",desc.szDrvname,lpContext); MultiByteToWideChar( CP_ACP, 0, "Primary Sound Driver", -1, wDesc, sizeof(wDesc)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, - wName, sizeof(wName)/sizeof(WCHAR) ); - if (lpDSEnumCallback(NULL, wDesc, wName, lpContext) == FALSE) + if (lpDSEnumCallback(NULL, wDesc, empty, lpContext) == FALSE) return DS_OK; } } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index eaeb606..3a1bd18 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1002,11 +1002,21 @@ EXIT: return rc; } +static unsigned int number; + static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext) { HRESULT rc; trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); + + /* Don't test the primary device */ + if (!number++) + { + ok (!lpcstrModule[0], "lpcstrModule(%s) != NULL\n", lpcstrModule); + return 1; + } + rc = test_dsound(lpGuid); if (rc == DSERR_NODRIVER) trace(" No Driver\n");

1 0