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

Paul Vriens : setupapi: Fix some last errors for SetupGetLineByIndex.
by Alexandre Julliard March 29, 2008

March 29, 2008

Module: wine Branch: master Commit: a3557272f4a3f58a579ae51aa267a9148eae0b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3557272f4a3f58a579ae51aa… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 28 16:41:20 2008 +0100 setupapi: Fix some last errors for SetupGetLineByIndex. --- dlls/setupapi/parser.c | 3 +-- dlls/setupapi/tests/parser.c | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index d266cf8..f6de4ed 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1311,11 +1311,9 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON struct inf_file *file = hinf; int section_index; - SetLastError( ERROR_SECTION_NOT_FOUND ); for (file = hinf; file; file = file->next) { if ((section_index = find_section( file, section )) == -1) continue; - SetLastError( ERROR_LINE_NOT_FOUND ); if (index < file->sections[section_index]->nb_lines) { context->Inf = hinf; @@ -1330,6 +1328,7 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON index -= file->sections[section_index]->nb_lines; } TRACE( "(%p,%s) not found\n", hinf, debugstr_w(section) ); + SetLastError( ERROR_LINE_NOT_FOUND ); return FALSE; } diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 1c74bd3..d49c37f 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -571,7 +571,6 @@ static void test_GLE(void) 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());

1 0

Paul Vriens : setupapi: Fix some last errors for SetupFindFirstLine.
by Alexandre Julliard March 29, 2008

March 29, 2008

Module: wine Branch: master Commit: 50e81d0e6d4fcf547fbbd9679d1a4f1f3a3a1eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e81d0e6d4fcf547fbbd9679… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 28 16:29:52 2008 +0100 setupapi: Fix some last errors for SetupFindFirstLine. --- dlls/setupapi/parser.c | 3 +-- dlls/setupapi/tests/parser.c | 3 --- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index fe2011e..d266cf8 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1371,7 +1371,6 @@ BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTE struct inf_file *file; int section_index; - SetLastError( ERROR_SECTION_NOT_FOUND ); for (file = hinf; file; file = file->next) { if ((section_index = find_section( file, section )) == -1) continue; @@ -1384,7 +1383,6 @@ BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTE ctx.Line = -1; return SetupFindNextMatchLineW( &ctx, key, context ); } - SetLastError( ERROR_LINE_NOT_FOUND ); /* found at least one section */ if (file->sections[section_index]->nb_lines) { context->Inf = hinf; @@ -1398,6 +1396,7 @@ BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTE } } TRACE( "(%p,%s,%s): not found\n", hinf, debugstr_w(section), debugstr_w(key) ); + SetLastError( ERROR_LINE_NOT_FOUND ); return FALSE; } diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index d36a729..1c74bd3 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -499,14 +499,12 @@ static void test_GLE(void) 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()); @@ -555,7 +553,6 @@ static void test_GLE(void) 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());

1 0

Alexandre Julliard : wine.inf: Create a fake module for mountmgr.sys.
by Alexandre Julliard March 29, 2008

March 29, 2008

Module: wine Branch: master Commit: 84308ffcde17383791f916e36df7b07067ca3558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84308ffcde17383791f916e36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 28 17:26:09 2008 +0100 wine.inf: Create a fake module for mountmgr.sys. --- tools/wine.inf | 1 + tools/wineprefixcreate.in | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index f3a45e6..ad59d4d 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2278,6 +2278,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,winver.exe 11,,ws2_32.dll 11,,wsock32.dll +12,,mountmgr.sys 16422,Internet Explorer,iexplore.exe [SystemIni] diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index d43330d..d91a3f6 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -158,7 +158,6 @@ for i in \ "$CROOT/windows/inf" \ "$CROOT/windows/system" \ "$CROOT/windows/system32" \ - "$CROOT/windows/system32/drivers" \ "$CROOT/windows/system32/spool" \ "$CROOT/windows/system32/spool/drivers" \ "$CROOT/windows/system32/spool/drivers/color" \

1 0

Alexandre Julliard : include: Fix access permissions in some ioctl codes, and add a few more.
by Alexandre Julliard March 29, 2008

March 29, 2008

Module: wine Branch: master Commit: f6e4d6225adccecb80cf48c8de20bf55d0f06c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e4d6225adccecb80cf48c8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 28 17:23:02 2008 +0100 include: Fix access permissions in some ioctl codes, and add a few more. --- include/winioctl.h | 165 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 97 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6e4d6225adccecb80cf4…

1 0

Lei Zhang : bugzilla: add link from enter bugs page to known issues page
by Jeremy Newman March 28, 2008

March 28, 2008

Module: bugzilla Branch: master Commit: badf99ca5eab035b9c027c86a5c5bf86eb002f8c URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=badf99ca5eab035b9c027… Author: Lei Zhang <thestig(a)google.com> Date: Sat Mar 15 11:08:27 2008 -0700 bugzilla: add link from enter bugs page to known issues page Hi, Bugs that have been closed no longer show up in the duplicate statistics. This is one of the possible reasons for some duplicate bugs. We list these issues on the known issues page in the wiki, so we should link to it from the enter bugs page. >From 5b95f95a4c1bb22778a9a2e9a625f82e860c4fbf Mon Sep 17 00:00:00 2001 From: Lei Zhang <thestig(a)google.com> Date: Sat, 15 Mar 2008 11:06:13 -0700 Subject: [PATCH] bugzilla: add link from enter bugs page to known issues page --- .../en/default/bug/create/user-message.html.tmpl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/template/en/default/bug/create/user-message.html.tmpl b/template/en/default/bug/create/user-message.html.tmpl index fddc31f..1dbfa12 100644 --- a/template/en/default/bug/create/user-message.html.tmpl +++ b/template/en/default/bug/create/user-message.html.tmpl @@ -33,6 +33,7 @@ Before reporting [% terms.abug %], please read the <a href="http://wiki.winehq.org/Bugs"> [% terms.bug %] writing guidelines</a>, please look at the list of -<a href="duplicates.cgi">most frequently reported [% terms.bugs %]</a>, and please +<a href="duplicates.cgi">most frequently reported [% terms.bugs %]</a>, the +list of <a href="http://wiki.winehq.org/KnownIssues">known issues</a>, and please <a href="query.cgi">search</a> for the [% terms.bug %] to avoid submitting a duplicate report.

1 0

Lei Zhang : bugzilla: don't tell users to guess bugzilla component
by Jeremy Newman March 28, 2008

March 28, 2008

Module: bugzilla Branch: master Commit: fc5994cd2f9a9a8855ea9905e1ba606c46b4751f URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=fc5994cd2f9a9a8855ea9… Author: Lei Zhang <thestig(a)google.com> Date: Tue Mar 18 21:54:03 2008 -0700 bugzilla: don't tell users to guess bugzilla component Hi, This patch gives bug reporters with a better error message. >From c96ef066be930207d9d127c0f7b28e87c89404e9 Mon Sep 17 00:00:00 2001 From: Lei Zhang <thestig(a)google.com> Date: Tue, 18 Mar 2008 21:49:22 -0700 Subject: [PATCH] bugzilla: don't tell users to guess bugzilla component --- template/en/default/global/user-error.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index f2deb75..5233af0 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1289,7 +1289,7 @@ [% ELSIF error == "require_component" %] [% title = "Component Needed" %] To file this [% terms.bug %], you must first choose a component. - If necessary, just guess. + If unsure, just select unknown. [% ELSIF error == "require_new_password" %] [% title = "New Password Needed" %]

1 0

Lei Zhang : bugzilla: use a different shade of red for error message backgrounds
by Jeremy Newman March 28, 2008

March 28, 2008

Module: bugzilla Branch: master Commit: d98162e76ce1f4c8e9db49962e63c44ab6ba07e9 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=d98162e76ce1f4c8e9db4… Author: Lei Zhang <thestig(a)google.com> Date: Sat Mar 15 11:19:54 2008 -0700 bugzilla: use a different shade of red for error message backgrounds Should fix bug 11871. >From d4c2552971f9c265270fc5150c1d78b3040da872 Mon Sep 17 00:00:00 2001 From: Lei Zhang <thestig(a)google.com> Date: Sat, 15 Mar 2008 11:18:37 -0700 Subject: [PATCH] bugzilla: use a different shade of red for error message backgrounds --- .../bug/create/confirm-create-dupe.html.tmpl | 2 +- template/en/default/global/code-error.html.tmpl | 2 +- template/en/default/global/user-error.html.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/en/default/bug/create/confirm-create-dupe.html.tmpl b/template/en/default/bug/create/confirm-create-dupe.html.tmpl index 9c2b3db..aecd668 100644 --- a/template/en/default/bug/create/confirm-create-dupe.html.tmpl +++ b/template/en/default/bug/create/confirm-create-dupe.html.tmpl @@ -31,7 +31,7 @@ <table cellpadding="20"> <tr> - <td bgcolor="#ff0000"> + <td bgcolor="#cc0000"> <font size="+2"> You already used the form to file [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %]. </font> diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 303c732..06124c4 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -481,7 +481,7 @@ <table cellpadding="20"> <tr> - <td bgcolor="#ff0000"> + <td bgcolor="#cc0000"> <font size="+2"> [% error_message FILTER none %] </font> diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 5801396..f2deb75 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1537,7 +1537,7 @@ <table cellpadding="20"> <tr> - <td bgcolor="#ff0000"> + <td bgcolor="#cc0000"> <font size="+2"> [% error_message FILTER none %] </font>

1 0

Lei Zhang : bugzilla: set mime types for log files as text/plain
by Jeremy Newman March 28, 2008

March 28, 2008

Module: bugzilla Branch: master Commit: 03fd95d16e0a651bc474fee9ee8a79e59c534dae URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=03fd95d16e0a651bc474f… Author: Lei Zhang <thestig(a)google.com> Date: Sat Mar 15 10:38:59 2008 -0700 bugzilla: set mime types for log files as text/plain Hi, Every time bugzilla detects an attachment as a log file, someone needs to manually change it to text/plain to make it viewable in the browser. This is rather annoying. >From 9bd8b5e3fc08963bc245acab3d8b6da490506b6d Mon Sep 17 00:00:00 2001 From: Lei Zhang <thestig(a)google.com> Date: Sat, 15 Mar 2008 10:28:44 -0700 Subject: [PATCH] bugzilla: set mime types for log files as text/plain --- Bugzilla/Attachment.pm | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm index a08c0d5..fa2994d 100644 --- a/Bugzilla/Attachment.pm +++ b/Bugzilla/Attachment.pm @@ -578,6 +578,10 @@ sub validate_content_type { if ( !$contenttype ) { $throw_error ? ThrowUserError("missing_content_type") : return 0; } + + if ($contenttype eq 'text/x-log') { + $contenttype = 'text/plain'; + } $cgi->param('contenttype', $contenttype); } elsif ($cgi->param('contenttypemethod') eq 'list') {

1 0

Paul Vriens : winetest: Fix statistics for Wine in the group part.
by Alexandre Julliard March 28, 2008

March 28, 2008

Module: tools Branch: master Commit: 80d9cc23867a714543b5603e701e8330709abd8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=80d9cc23867a714543b5603e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 28 15:11:21 2008 +0100 winetest: Fix statistics for Wine in the group part. --- winetest/gather | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index 7b10e36..d2863be 100755 --- a/winetest/gather +++ b/winetest/gather @@ -362,7 +362,7 @@ EOF "pass"; my $count=!$report->{todos} ? $report->{errors} : !$report->{errors} ? $report->{todos} : - "$group->{errors}+$group->{todos}"; + "$report->{errors}+$report->{todos}"; my $prcnt=!$report->{todos} ? percent($report->{errors}, $unit_count) : !$report->{errors} ? percent($report->{todos}, $unit_count) :

1 0

Francois Gouget : winetest: Quote the Javascript refresh() parameters because they may be non-numerical now.
by Alexandre Julliard March 28, 2008

March 28, 2008

Module: tools Branch: master Commit: 30ec1071fdc386a49fb1ac0ee14de2dcd5f24f4b URL: http://source.winehq.org/git/tools.git/?a=commit;h=30ec1071fdc386a49fb1ac0e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 28 01:34:19 2008 +0100 winetest: Quote the Javascript refresh() parameters because they may be non-numerical now. --- winetest/gather | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index 294ad06..7b10e36 100755 --- a/winetest/gather +++ b/winetest/gather @@ -487,7 +487,7 @@ sub singletest($$$) { "$result->{errors}->[1]+$result->{todos}->[1]"; print OUT <<"EOF"; <td class="result $class"><a $href title="$title" - onMouseOver="refresh('$testname', '$label', $mm_count, $mm_todos, $mm_errors, $mm_skips);" + onMouseOver="refresh('$testname', '$label', '$mm_count', '$mm_todos', '$mm_errors', '$mm_skips');" >$msg</a></td> EOF }

1 0