April 2011 - Wine-Commits - list.winehq.org

André Hentschel : ntdll: Fix usage of ContextFlags on Sparc.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: 578931120157cc44eb7c92ddd5572babe4c961ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=578931120157cc44eb7c92ddd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 20 21:30:57 2011 +0200 ntdll: Fix usage of ContextFlags on Sparc. --- dlls/ntdll/signal_sparc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 29414d7..ac9ee9c 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -71,6 +71,8 @@ static inline int dispatch_signal(unsigned int sig) */ static void save_context( CONTEXT *context, ucontext_t *ucontext ) { + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER; + /* Special registers */ context->psr = ucontext->uc_mcontext.gregs[REG_PSR]; context->pc = ucontext->uc_mcontext.gregs[REG_PC];

1 0

André Hentschel : ntdll: Fix usage of ContextFlags on ARM.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: c7600f8d75223f8243647bbb8478bbfd07e8db7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7600f8d75223f8243647bbb8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 20 21:30:52 2011 +0200 ntdll: Fix usage of ContextFlags on ARM. --- dlls/ntdll/signal_arm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7a9d9f9..49caec8 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -115,6 +115,7 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) C(0); C(1); C(2); C(3); C(4); C(5); C(6); C(7); C(8); C(9); C(10); #undef C + context->ContextFlags = CONTEXT_FULL; context->Sp = SP_sig(sigcontext); /* Stack pointer */ context->Lr = LR_sig(sigcontext); /* Link register */ context->Pc = PC_sig(sigcontext); /* Program Counter */ @@ -218,6 +219,7 @@ void set_cpu_context( const CONTEXT *context ) */ void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) { + flags &= ~CONTEXT_ARM; /* get rid of CPU id */ if (flags & CONTEXT_CONTROL) { to->Sp = from->Sp; @@ -251,7 +253,7 @@ void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) */ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) { - DWORD flags = from->ContextFlags; /* no CPU id? */ + DWORD flags = from->ContextFlags & ~CONTEXT_ARM; /* get rid of CPU id */ memset( to, 0, sizeof(*to) ); to->cpu = CPU_ARM; @@ -294,7 +296,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { if (from->cpu != CPU_ARM) return STATUS_INVALID_PARAMETER; - to->ContextFlags = 0; /* no CPU id? */ + to->ContextFlags = CONTEXT_ARM; if (from->flags & SERVER_CTX_CONTROL) { to->ContextFlags |= CONTEXT_CONTROL;

1 0

Alexandre Julliard : server: Also return the previous cursor position in the set_cursor request.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: abe5440e3218f4e2dce7759ed6fc84e96de06a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe5440e3218f4e2dce7759ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 20 20:29:16 2011 +0200 server: Also return the previous cursor position in the set_cursor request. --- include/wine/server_protocol.h | 6 ++++-- server/protocol.def | 2 ++ server/queue.c | 2 ++ server/request.h | 12 +++++++----- server/trace.c | 2 ++ 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 98bc101..6fdae05 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4801,11 +4801,13 @@ struct set_cursor_reply struct reply_header __header; user_handle_t prev_handle; int prev_count; + int prev_x; + int prev_y; int new_x; int new_y; rectangle_t new_clip; unsigned int last_change; - char __pad_44[4]; + char __pad_52[4]; }; #define SET_CURSOR_HANDLE 0x01 #define SET_CURSOR_COUNT 0x02 @@ -5558,6 +5560,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 421 +#define SERVER_PROTOCOL_VERSION 422 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 7e0f0c8..6984bc5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3317,6 +3317,8 @@ enum coords_relative @REPLY user_handle_t prev_handle; /* previous handle */ int prev_count; /* previous show count */ + int prev_x; /* previous position */ + int prev_y; int new_x; /* new position */ int new_y; rectangle_t new_clip; /* new clip rectangle */ diff --git a/server/queue.c b/server/queue.c index b9b42e4..91fe1fc 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2650,6 +2650,8 @@ DECL_HANDLER(set_cursor) reply->prev_handle = input->cursor; reply->prev_count = input->cursor_count; + reply->prev_x = input->desktop->cursor.x; + reply->prev_y = input->desktop->cursor.y; if (req->flags & SET_CURSOR_HANDLE) { diff --git a/server/request.h b/server/request.h index acf886f..b08033e 100644 --- a/server/request.h +++ b/server/request.h @@ -2101,11 +2101,13 @@ C_ASSERT( FIELD_OFFSET(struct set_cursor_request, clip_msg) == 48 ); C_ASSERT( sizeof(struct set_cursor_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_handle) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_count) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_x) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_y) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_clip) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, last_change) == 40 ); -C_ASSERT( sizeof(struct set_cursor_reply) == 48 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_x) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_y) == 20 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_x) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_y) == 28 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_clip) == 32 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, last_change) == 48 ); +C_ASSERT( sizeof(struct set_cursor_reply) == 56 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 2d2d82b..a296341 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3854,6 +3854,8 @@ static void dump_set_cursor_reply( const struct set_cursor_reply *req ) { fprintf( stderr, " prev_handle=%08x", req->prev_handle ); fprintf( stderr, ", prev_count=%d", req->prev_count ); + fprintf( stderr, ", prev_x=%d", req->prev_x ); + fprintf( stderr, ", prev_y=%d", req->prev_y ); fprintf( stderr, ", new_x=%d", req->new_x ); fprintf( stderr, ", new_y=%d", req->new_y ); dump_rectangle( ", new_clip=", &req->new_clip );

1 0

Alexandre Julliard : user32: Only call the driver when the cursor position has really changed.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: 79c2e55b5a6331d15788f65a929e9e002c2f8b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c2e55b5a6331d15788f65a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 20 20:30:09 2011 +0200 user32: Only call the driver when the cursor position has really changed. --- dlls/user32/input.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 9b22021..28377e7 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -301,6 +301,7 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) { BOOL ret; + INT prev_x, prev_y, new_x, new_y; SERVER_START_REQ( set_cursor ) { @@ -309,12 +310,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) req->y = y; if ((ret = !wine_server_call( req ))) { - x = reply->new_x; - y = reply->new_y; + prev_x = reply->prev_x; + prev_y = reply->prev_y; + new_x = reply->new_x; + new_y = reply->new_y; } } SERVER_END_REQ; - if (ret) USER_Driver->pSetCursorPos( x, y ); + if (ret && (prev_x != new_x || prev_y != new_y)) USER_Driver->pSetCursorPos( new_x, new_y ); return ret; }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetParameterByName().
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: b483ab8200afe5eac60c74b6cfa2b96ab6ee61a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b483ab8200afe5eac60c74b6c… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 20 21:55:37 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetParameterByName(). --- dlls/d3dx9_36/effect.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 169 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 081da31..30f533f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -436,6 +436,159 @@ static void free_effect_compiler(struct ID3DXEffectCompilerImpl *compiler) } } +static LPSTR get_partial_string(LPCSTR name, char initial, char final) +{ + UINT length; + LPCSTR begin; + LPSTR part; + + TRACE("name %s, initial %c, final %c\n", debugstr_a(name), initial, final); + + begin = initial ? (strchr(name, initial) + 1) : name; + length = strchr(name, final) - begin; + if (length < 1) + { + WARN("Invalied argument specified.\n"); + return NULL; + } + + part = HeapAlloc(GetProcessHeap(), 0, length + 1); + if (!part) + { + ERR("Out of memory\n"); + return NULL; + } + memcpy(part, begin, length); + part[length] = 0; + + TRACE("part %s\n", debugstr_a(part)); + return part; +} + +static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl *base, struct d3dx_parameter *parameter, LPCSTR name, BOOL is_annotation) +{ + unsigned int i; + struct d3dx_parameter *temp_parameter; + LPSTR part; + + TRACE("base %p, parameter %p, name %s, is_annotation %s\n", base, parameter, debugstr_a(name), is_annotation ? "YES" : "NO"); + + if (!name) return NULL; + + /* members */ + if (strchr(name, '.')) + { + part = get_partial_string(name, 0, '.'); + temp_parameter = get_parameter_by_name(base, parameter, part, is_annotation); + HeapFree(GetProcessHeap(), 0, part); + + if (temp_parameter) + { + temp_parameter = get_parameter_by_name(base, temp_parameter, strchr(name, '.') + 1, FALSE); + TRACE("Returning sub parameter %p\n", temp_parameter); + return temp_parameter; + } + + TRACE("Sub parameter not found\n"); + return NULL; + } + + /* annotations */ + if (strchr(name, '@')) + { + part = get_partial_string(name, 0, '@'); + temp_parameter = get_parameter_by_name(base, parameter, part, is_annotation); + HeapFree(GetProcessHeap(), 0, part); + + if (temp_parameter) + { + temp_parameter = get_parameter_by_name(base, temp_parameter, strchr(name, '@') + 1, TRUE); + TRACE("Returning sub parameter %p\n", temp_parameter); + return temp_parameter; + } + + TRACE("Sub parameter not found\n"); + return NULL; + } + + /* elements */ + if (strchr(name, '[')) + { + part = get_partial_string(name, 0, '['); + temp_parameter = get_parameter_by_name(base, parameter, part, is_annotation); + HeapFree(GetProcessHeap(), 0, part); + + if (temp_parameter) + { + unsigned int index; + + part = get_partial_string(name, '[', ']'); + index = atoi(part); + HeapFree(GetProcessHeap(), 0, part); + + if (index < temp_parameter->element_count) + { + TRACE("Returning sub parameter %p\n", get_parameter_struct(temp_parameter->member_handles[index])); + return get_parameter_struct(temp_parameter->member_handles[index]); + } + } + + TRACE("Sub parameter not found\n"); + return NULL; + } + + if (!parameter) + { + for (i=0; i < base->parameter_count; i++) + { + temp_parameter = get_parameter_struct(base->parameter_handles[i]); + + if (!strcmp(temp_parameter->name, name)) + { + TRACE("Returning parameter %p\n", temp_parameter); + return temp_parameter; + } + } + } + else + { + if (is_annotation) + { + for (i = 0; i < parameter->annotation_count; i++) + { + temp_parameter = get_parameter_struct(parameter->annotation_handles[i]); + + if (!strcmp(temp_parameter->name, name)) + { + TRACE("Returning parameter %p\n", temp_parameter); + return temp_parameter; + } + } + } + else + { + unsigned int count; + + if (parameter->element_count) count = parameter->element_count; + else count = parameter->member_count; + + for (i = 0; i < count; i++) + { + temp_parameter = get_parameter_struct(parameter->member_handles[i]); + + if (!strcmp(temp_parameter->name, name)) + { + TRACE("Returning parameter %p\n", temp_parameter); + return temp_parameter; + } + } + } + } + + TRACE("Parameter not found\n"); + return NULL; +} + static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) { return (0xfeff0000 | ((major) << 8) | (minor)); @@ -595,10 +748,24 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameter(ID3DXBaseEffect *iface static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameterByName(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPCSTR name) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); + D3DXHANDLE handle; - FIXME("iface %p, parameter %p, name %s stub\n", This, parameter, debugstr_a(name)); + TRACE("iface %p, parameter %p, name %s\n", This, parameter, debugstr_a(name)); - return NULL; + if (!param) param = get_parameter_by_name(This, NULL, parameter, FALSE); + + if (!name) + { + handle = get_parameter_handle(param); + TRACE("Returning parameter %p\n", handle); + return handle; + } + + handle = get_parameter_handle(get_parameter_by_name(This, param, name, FALSE)); + TRACE("Returning parameter %p\n", handle); + + return handle; } static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameterBySemantic(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPCSTR semantic)

1 0

André Hentschel : ntdll: Be more generic when storing ARM context.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: e40d1aae36a271314b0bd832a841be316b22babb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40d1aae36a271314b0bd832a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 20 20:02:52 2011 +0200 ntdll: Be more generic when storing ARM context. --- dlls/ntdll/signal_arm.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index c87bb1c..7a9d9f9 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -2,7 +2,7 @@ * ARM signal handling routines * * Copyright 2002 Marcus Meissner, SuSE Linux AG - * Copyright 2010 André Hentschel + * Copyright 2010, 2011 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -177,9 +177,25 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */ "str r1, [r0]\n\t" /* context->ContextFlags */ "ldmfd SP!, {r1}\n\t" - "stmib r0, {r0-pc}\n\t" /* Push registers to pointer */ + "str r0, [r0, #0x4]\n\t" /* context->R0 */ + "str r1, [r0, #0x8]\n\t" /* context->R1 */ + "str r2, [r0, #0xc]\n\t" /* context->R2 */ + "str r3, [r0, #0x10]\n\t" /* context->R3 */ + "str r4, [r0, #0x14]\n\t" /* context->R4 */ + "str r5, [r0, #0x18]\n\t" /* context->R5 */ + "str r6, [r0, #0x1c]\n\t" /* context->R6 */ + "str r7, [r0, #0x20]\n\t" /* context->R7 */ + "str r8, [r0, #0x24]\n\t" /* context->R8 */ + "str r9, [r0, #0x28]\n\t" /* context->R9 */ + "str r10, [r0, #0x2c]\n\t" /* context->R10 */ + "str r11, [r0, #0x30]\n\t" /* context->Fp */ + "str IP, [r0, #0x34]\n\t" /* context->Ip */ + "str SP, [r0, #0x38]\n\t" /* context->Sp */ + "str LR, [r0, #0x3c]\n\t" /* context->Lr */ + "str LR, [r0, #0x40]\n\t" /* context->Pc */ "mrs r1, CPSR\n\t" - "stmib r0, {r1}\n\t" /* context->Cpsr */ + "str r1, [r0, #0x44]\n\t" /* context->Cpsr */ + "mov PC, LR\n" )

1 0

Alexander Nicolaysen Sørnes : objectManager: Fix typo in session tiemout screen ( spotted by Steven Zakulec)
by Alexander Nicolaysen Sørnes April 21, 2011

April 21, 2011

Module: appdb Branch: master Commit: 5f85da8b7278b0b6829674ce94a47cfee3b8478d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5f85da8b7278b0b6829674ce… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Thu Apr 21 16:04:10 2011 +0200 objectManager: Fix typo in session tiemout screen (spotted by Steven Zakulec) --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 1f250aa..82d1a26 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1225,7 +1225,7 @@ class ObjectManager public function show_form_help_session_timeout() { - $this->error_exit("Your session has timed out. <a target=\"_blank\" href=\"".BASE."account.php?sCmd=login\">Log in</a> and then <a href=\"javascript:location.reload();\">refresh thise page</a>."); + $this->error_exit("Your session has timed out. <a target=\"_blank\" href=\"".BASE."account.php?sCmd=login\">Log in</a> and then <a href=\"javascript:location.reload();\">refresh this page</a>."); } public function handle_anonymous_submission($aClean)

1 0

Andre Hentschel : config.php.sample: Include 1.2 as a stable branch
by Alexander Nicolaysen Sørnes April 21, 2011

April 21, 2011

Module: appdb Branch: master Commit: 17d150bb77005eec33afa4b9a49751b065fa8647 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=17d150bb77005eec33afa4b9… Author: Andre Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 21 15:12:36 2011 +0200 config.php.sample: Include 1.2 as a stable branch --- include/config.php.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/config.php.sample b/include/config.php.sample index 86f924a..f58b49b 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -35,7 +35,7 @@ define("TESTDATA_AGED_THRESHOLD", 175); // Show versions from these branches even if they are not among the most recent ones // Separate by commas if there are more than one -define("STABLE_BRANCHES", "1.0."); +define("STABLE_BRANCHES", "1.0.,1.2."); /* * apps database info

1 0

Alexandre Julliard : winetest: Do not count test runs with no results as a success for the index page.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: tools Branch: master Commit: 7b4fd493ca841a7a1b18563533d6b481f4da48da URL: http://source.winehq.org/git/tools.git/?a=commit;h=7b4fd493ca841a7a1b185635… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 21 11:57:59 2011 +0200 winetest: Do not count test runs with no results as a success for the index page. --- winetest/gather | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index 8a538d9..ab5e41f 100755 --- a/winetest/gather +++ b/winetest/gather @@ -291,6 +291,7 @@ foreach my $group (@groups) { $report->{errors} = 0; $report->{successes} = 0; $report->{todos} = 0; + $report->{runs} = 0; foreach my $testname (sort keys %alltests) { my $result = $report->{$testname}; if ($result->{status} !~ /^(?:dll missing|run|skipped)$/ or @@ -304,10 +305,14 @@ foreach my $group (@groups) { { $report->{todos}++; } + if ($result->{status} !~ /^(?:dll missing|skipped)$/) + { + $report->{runs}++; + } } } foreach my $report (@{$group->{reports}}) { - $group->{successes}++ if !$report->{errors}; + $group->{successes}++ if !$report->{errors} && $report->{runs}; } }

1 0

Alexandre Julliard : winetest: Ignore user-skipped tests also when merging with a missing dll case.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: tools Branch: master Commit: 0c6f3aa99c46ea7ac965683b0e613e4241b4bf4b URL: http://source.winehq.org/git/tools.git/?a=commit;h=0c6f3aa99c46ea7ac965683b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 21 11:51:55 2011 +0200 winetest: Ignore user-skipped tests also when merging with a missing dll case. --- winetest/gather | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index ccce11c..8a538d9 100755 --- a/winetest/gather +++ b/winetest/gather @@ -209,11 +209,15 @@ sub merge_status($$) my ($group_result, $result) = @_; if (!defined $group_result->{status}) { $group_result->{status} = $result->{status}; - } elsif ($group_result->{status} =~ /^(dll missing|skipped)$/ and + } elsif ($group_result->{status} eq "skipped") { + $group_result->{status} = $result->{status}; + } elsif ($result->{status} eq "skipped") { + ; # Nothing to do + } elsif ($group_result->{status} eq "dll missing" and $result->{status} eq "run") { $group_result->{status} = "run"; } elsif ($group_result->{status} eq "run" and - $result->{status} =~ /^(dll missing|skipped)$/) { + $result->{status} eq "dll missing") { ; # Nothing to do } elsif ($group_result->{status} ne $result->{status}) { $group_result->{status} = "mixed";

1 0