February 2009 - Wine-Commits

Henri Verbeet : wined3d: Add DXGI formats to WINED3DFORMAT.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 8cefc47d8106451cb762332f25ac63cdff02fb90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cefc47d8106451cb762332f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 19 16:59:42 2009 +0100 wined3d: Add DXGI formats to WINED3DFORMAT. --- dlls/d3d8/device.c | 36 ++-- dlls/d3d9/device.c | 72 +++--- dlls/ddraw/ddraw.c | 8 +- dlls/ddraw/device.c | 27 +-- dlls/ddraw/direct3d.c | 13 +- dlls/ddraw/utils.c | 14 +- dlls/wined3d/device.c | 12 +- dlls/wined3d/directx.c | 78 +++--- dlls/wined3d/surface.c | 10 +- dlls/wined3d/surface_base.c | 10 +- dlls/wined3d/utils.c | 590 ++++++++++++++++++++++++++----------------- include/wine/wined3d.idl | 176 +++++++++---- 12 files changed, 619 insertions(+), 427 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8cefc47d8106451cb7623…

1 0

Alexandre Julliard : winetest: Get rid of the archive URL, it' s no longer used.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 9caf14c44434ec02f2e3ec58ad734df38f2d66d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9caf14c44434ec02f2e3ec58a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 19 20:27:53 2009 +0100 winetest: Get rid of the archive URL, it's no longer used. --- programs/winetest/Makefile.in | 2 +- programs/winetest/dist.rc | 3 --- programs/winetest/main.c | 5 +---- programs/winetest/resource.h | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 05427e7..140adb5 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -55,7 +55,7 @@ winetest-dist.exe: $(OBJS) dist.res.o Makefile.in $(CC) $(APPMODE) $(OBJS) dist.res.o -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS) -upx -9 -qqq $@ -dist.res: winetest.rc tests.rc build.nfo tests.url winetest.ico $(TESTBINS) +dist.res: winetest.rc tests.rc build.nfo winetest.ico $(TESTBINS) @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/winetest/dist.rc b/programs/winetest/dist.rc index e7080db..4acbfa6 100644 --- a/programs/winetest/dist.rc +++ b/programs/winetest/dist.rc @@ -22,6 +22,3 @@ /* @makedep: build.nfo */ BUILD_INFO STRINGRES "build.nfo" - -/* @makedep: tests.url */ -TESTS_URL STRINGRES "tests.url" diff --git a/programs/winetest/main.c b/programs/winetest/main.c index ab9c79e..e53502d 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -631,10 +631,7 @@ run_tests (char *logname) xprintf ("Version 4\n"); xprintf ("Tests from build %s\n", build_id[0] ? build_id : "-" ); - strres = extract_rcdata (MAKEINTRESOURCE(TESTS_URL), STRINGRES, &strsize); - xprintf ("Archive: "); - if (strres) xprintf ("%.*s", strsize, strres); - else xprintf ("-\n"); + xprintf ("Archive: -\n"); /* no longer used */ xprintf ("Tag: %s\n", tag); xprintf ("Build info:\n"); strres = extract_rcdata (MAKEINTRESOURCE(BUILD_INFO), STRINGRES, &strsize); diff --git a/programs/winetest/resource.h b/programs/winetest/resource.h index 4b21491..6676508 100644 --- a/programs/winetest/resource.h +++ b/programs/winetest/resource.h @@ -52,4 +52,3 @@ /* String resources */ #define BUILD_INFO 10001 -#define TESTS_URL 10002

1 0

Rein Klazes : user32/resources: Remove the "switch to... <Ctrl+Esc>" item from the system menu.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 14f0e8ba4be6f7568a78b6414a4ce6de67ae0b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f0e8ba4be6f7568a78b6414… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Feb 19 16:01:47 2009 +0100 user32/resources: Remove the "switch to... <Ctrl+Esc>" item from the system menu. --- 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_Fr.rc | 2 -- dlls/user32/resources/user32_Hu.rc | 2 -- dlls/user32/resources/user32_It.rc | 2 -- dlls/user32/resources/user32_Ja.rc | 2 -- dlls/user32/resources/user32_Ko.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_Ro.rc | 2 -- 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 -- dlls/user32/resources/user32_Wa.rc | 2 -- dlls/user32/resources/user32_Zh.rc | 4 ---- 27 files changed, 0 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14f0e8ba4be6f7568a78b…

1 0

Henri Verbeet : d3d8: Explicitly convert between D3DFORMAT and WINED3DFORMAT values.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: d575b5fecb53aab994cf68beb1a90c708655d908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d575b5fecb53aab994cf68beb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 19 16:59:41 2009 +0100 d3d8: Explicitly convert between D3DFORMAT and WINED3DFORMAT values. --- dlls/d3d8/cubetexture.c | 3 + dlls/d3d8/d3d8_private.h | 2 + dlls/d3d8/device.c | 160 ++++++++++++++++++++++++++++++++++++++------- dlls/d3d8/directx.c | 31 +++++---- dlls/d3d8/indexbuffer.c | 3 + dlls/d3d8/surface.c | 3 + dlls/d3d8/texture.c | 3 + dlls/d3d8/vertexbuffer.c | 3 + dlls/d3d8/volume.c | 3 + dlls/d3d8/volumetexture.c | 3 + 10 files changed, 177 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d575b5fecb53aab994cf6…

1 0

Henri Verbeet : d3d9: Explicitly convert between D3DFORMAT and WINED3DFORMAT values.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 61a9efc4b93100a4f32f3ccdeaf32f12daccb288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a9efc4b93100a4f32f3ccde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 19 16:59:42 2009 +0100 d3d9: Explicitly convert between D3DFORMAT and WINED3DFORMAT values. --- dlls/d3d9/cubetexture.c | 9 ++- dlls/d3d9/d3d9_private.h | 2 + dlls/d3d9/device.c | 178 ++++++++++++++++++++++++++++++++++++++++----- dlls/d3d9/directx.c | 46 +++++++----- dlls/d3d9/indexbuffer.c | 7 ++- dlls/d3d9/surface.c | 6 +- dlls/d3d9/swapchain.c | 15 ++-- dlls/d3d9/texture.c | 9 ++- dlls/d3d9/vertexbuffer.c | 3 + dlls/d3d9/volume.c | 10 ++- dlls/d3d9/volumetexture.c | 13 +++- 11 files changed, 243 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61a9efc4b93100a4f32f3…

1 0

Alexandre Julliard : winetest: Ignore the archive header in reports, always point to the official build.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: tools Branch: master Commit: d119114a38eec968d7add184899e1cc6c20c6f56 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d119114a38eec968d7add184… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 19 19:46:56 2009 +0100 winetest: Ignore the archive header in reports, always point to the official build. --- winetest/dissect | 13 +++++++------ winetest/gather | 7 +------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index bbc9799..a9b64dc 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -100,20 +100,19 @@ $testbuild =~ /^[0-9a-f]{40}$/ or mydie "not a valid commit id $testbuild\n"; my $commit = `git rev-parse --verify $testbuild^0 2>/dev/null`; chomp $commit; $testbuild eq $commit or mydie "not an existing commit $testbuild\n"; +my $shortbuild = substr($testbuild,0,12); +my $archive = "winetest-$shortbuild.exe"; $_ = <IN>; -/^Archive: (.*?)\r?$/ or mydie "no archive line: $_"; -my $archive = $1; -print SUM "Archive: $1\n"; +if (/^Archive: /) { $_ = <IN>; } # ignore Archive header -$_ = <IN>; /^Tag: ([-.0-9a-zA-Z]*)\r?$/ or mydie "no tag line: $_"; my $tag = $1 eq ""?"":"_$1"; $_ = <IN>; /^Build info:\r?$/ or mydie "no Build info header: $_"; my $box = create_box( "build", "build", "Build info" ); -$box->{data} .= sprintf "<div class=\"output\">Build: <a title=\"%s\" href=\"$gitweb/?a=shortlog;h=%s\">%s</a></div>\n", $testbuild, $testbuild, substr($testbuild,0,12); +$box->{data} .= sprintf "<div class=\"output\">Build: <a title=\"%s\" href=\"$gitweb/?a=shortlog;h=%s\">%s</a></div>\n", $testbuild, $testbuild, $shortbuild; $box->{data} .= sprintf "<div class=\"output\">Tag: %s</div>\n", substr($tag,1); $box->{data} .= sprintf "<div class=\"output\"> </div>\n"; while (($_ = <IN>) =~ s/^ //) @@ -142,6 +141,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { $product = $2; } elsif ($1 eq "WineBuild") { $wine_build = $2; + } elsif ($1 eq "Platform") { + $archive = "winetest64-$shortbuild.exe" if ($2 eq "x86_64"); } } $box->{data} .= "</table>"; @@ -343,7 +344,7 @@ open REPORT, ">$tmpdir/report.html" or mydie "unable to open '$tmpdir/report.htm print REPORT start_html( -title => "Wine test run report", -style => {src=>"/report.css"} ); print REPORT "<div class=\"navbar\">"; print REPORT "<a href=\"report\">raw report</a> | <a href=\"..\">summary</a> | <a href=\"../..\">index</a>"; -if ($archive =~ /^http:\/\//) { printf REPORT " | <a href=\"%s\">test binary</a>", escapeHTML($archive); } +printf REPORT " | <a href=\"/builds/%s\">test binary</a>", escapeHTML($archive) if $archive; print REPORT "</div>\n"; for (my $i = 0; $i <= $#boxes; $i++) diff --git a/winetest/gather b/winetest/gather index 3c9946b..6d40787 100755 --- a/winetest/gather +++ b/winetest/gather @@ -147,14 +147,9 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { close TEST; next; } - my $archive = <TEST>; - if ($archive !~ s/^Archive: (.*)\n$/$1/) { - print STDERR "$name0:error: wrong archive url in '$file': $archive"; - close TEST; - next; - } while (<TEST>) { + next if /^Archive: /; my ($dummy, $dll, $unit, $count, $todos, $errors, $skips, $source, $rev) = split; my $testname = "$dll:$unit";

1 0

Alexandre Julliard : winetest: Parse expected todo failures in reports.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: tools Branch: master Commit: cd0b7f43affdb25eaa148f492aaa2f1bc94baecf URL: http://source.winehq.org/git/tools.git/?a=commit;h=cd0b7f43affdb25eaa148f49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 19 16:39:29 2009 +0100 winetest: Parse expected todo failures in reports. --- winetest/dissect | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index d6daf39..bbc9799 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -273,6 +273,7 @@ while (<IN>) { my $class = "test trace"; if ($text =~ /^Test failed: /) { $class = "test failed"; } elsif ($text =~ /^Test succeeded inside todo block: /) { $class = "test failed"; } + elsif ($text =~ /^Test marked todo: /) { $class = "test todo"; } elsif ($text =~ /^Tests skipped: /) { $class = "test skipped"; } $box->{data} .= sprintf "<div class=\"%s\"><a href=%s/?a=blob;f=%s;hb=%s#l%u>%s.c:%u</a>: %s</div>\n", $class, $gitweb, $source, $testbuild, $line, $unit, $line, escapeHTML($text);

1 0

Alexandre Julliard : winetest: Change the colors for todos and skips in reports to match the colors used in the summary .
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: tools Branch: master Commit: f035793b79a52c4aa9b4a3ac31624f81106032e4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f035793b79a52c4aa9b4a3ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 19 16:39:47 2009 +0100 winetest: Change the colors for todos and skips in reports to match the colors used in the summary. --- winetest/report.css | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/report.css b/winetest/report.css index 1d560a1..3cb2e98 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -48,9 +48,9 @@ div.end { } .result { color: green; } -.skipped { color: #c08000; } +.skipped { color: blue; } .failed { color: red; } -.todo { color: blue; } +.todo { color: #d08000; } .trace { color: black; } table.output td {

1 0

Igor Tarasov : comctl32: Make listview forward HDN_ITEMCLICK.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: b3b7ecb390d807ab80d07a3a4f859ec936106ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b7ecb390d807ab80d07a3a4… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Tue Feb 17 15:20:52 2009 +0400 comctl32: Make listview forward HDN_ITEMCLICK. --- dlls/comctl32/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6724139..66b45b4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8986,6 +8986,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE nmlv.iItem = -1; nmlv.iSubItem = lpnmh->iItem; notify_listview(infoPtr, LVN_COLUMNCLICK, &nmlv); + notify_forward_header(infoPtr, lpnmh); } break;

1 0

Artem Reznikov : shlwapi: Ukranian translation.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: 34e2848838b62738b6d24d793334873d706ad10a URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e2848838b62738b6d24d793… Author: Artem Reznikov <temarez(a)yandex.ru> Date: Thu Feb 19 14:41:09 2009 +0100 shlwapi: Ukranian translation. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Uk.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index 2a205fe..d159dab 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -46,4 +46,5 @@ #include "shlwapi_Sk.rc" #include "shlwapi_Sv.rc" #include "shlwapi_Tr.rc" +#include "shlwapi_Uk.rc" #include "shlwapi_Zh.rc" diff --git a/dlls/shlwapi/shlwapi_Uk.rc b/dlls/shlwapi/shlwapi_Uk.rc new file mode 100644 index 0000000..a8a1e3d --- /dev/null +++ b/dlls/shlwapi/shlwapi_Uk.rc @@ -0,0 +1,43 @@ +/* + * Ukranian resources for shlwapi + * + * Copyright 2007 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "��!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "&�� ", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&��" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&��" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&ͳ" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld ��" + IDS_TIME_INTERVAL_HOURS " ��" + IDS_TIME_INTERVAL_MINUTES " ��" + IDS_TIME_INTERVAL_SECONDS " ��." +}

1 0