July 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : patches: Generate a static html index so that we don' t need to delete old patch files.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: tools Branch: master Commit: 68967d664f38eb705ee3769804160567e831ee0f URL: http://source.winehq.org/git/tools.git/?a=commit;h=68967d664f38eb705ee37698… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 12:42:46 2010 +0200 patches: Generate a static html index so that we don't need to delete old patch files. --- patches/{index.cgi => update} | 44 +++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/patches/index.cgi b/patches/update similarity index 82% rename from patches/index.cgi rename to patches/update index 5016363..e18d32d 100755 --- a/patches/index.cgi +++ b/patches/update @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Patches CGI script +# Update the patches data and index file # # Copyright 2009 Alexandre Julliard # @@ -80,7 +80,8 @@ my @legend = "<li>The patch fixes a failure but doesn't remove the corresponding todo_wine.</li></ul>" ], ); -my $dir = "data"; +my $dir = "$ENV{HOME}/patches"; +my $dest = "/home/winehq/opt/source/patches"; my %patches; sub format_author($) @@ -90,13 +91,14 @@ sub format_author($) return $_; } -print header( -charset => "utf-8" ); -print start_html(-title=>"Patches list", - -encoding=>"utf-8", - -style=>{src=>"patches.css"}); +open INDEX, "> $dest/index.html.new" or die "cannot create $dest/index.html.new"; -print "<div class=\"main\">\n"; -print "<table class=\"main\"><tr><th class=\"id\">ID</th>", +print INDEX start_html(-title=>"Patches list", + -encoding=>"utf-8", + -style=>{src=>"patches.css"}); + +print INDEX "<div class=\"main\">\n"; +print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", @@ -147,33 +149,37 @@ my $row = 0; foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } keys %patches) { my $patch = $patches{$file}; - printf "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td><td class=\"author\">%s</td>", + printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td><td class=\"author\">%s</td>", $row & 1 ? "odd" : "even", $patch->{"status"}, $file, $status_descr{$patch->{"status"}} || $patch->{"status"}, escapeHTML($patch->{"author"}); - printf "<td class=\"subject\"><a href=\"data/$file\">%s</a></td>", + printf INDEX "<td class=\"subject\"><a href=\"data/$file\">%s</a></td>", escapeHTML($patch->{"subject"}); if ($patch->{"testbot"} eq "Failed") { - print "<td class=\"testbot botfail\"><a href=\"data/$file.testfail\">Failed</a></td>"; + print INDEX "<td class=\"testbot botfail\"><a href=\"data/$file.testfail\">Failed</a></td>"; } else { - printf "<td class=\"testbot\">%s</td>", $patch->{"testbot"}; + printf INDEX "<td class=\"testbot\">%s</td>", $patch->{"testbot"}; } - print "</tr>\n"; + print INDEX "</tr>\n"; $row++; } -print "</table></div>\n"; +print INDEX "</table></div>\n"; $row = 0; -print "<div class=\"legend\"><h2><a name=\"legend\">Legend</a></h2>\n"; -print "<table class=\"legend\"><tr><th class=\"status\">Status</th><th class=\"causes\">Possible causes</th></tr>\n"; +print INDEX "<div class=\"legend\"><h2><a name=\"legend\">Legend</a></h2>\n"; +print INDEX "<table class=\"legend\"><tr><th class=\"status\">Status</th><th class=\"causes\">Possible causes</th></tr>\n"; foreach my $status (@legend) { - printf "<tr class=\"%s\"><td class=\"status %s\">%s</td><td class=\"causes\">%s</td></tr>\n", + printf INDEX "<tr class=\"%s\"><td class=\"status %s\">%s</td><td class=\"causes\">%s</td></tr>\n", $row & 1 ? "odd" : "even", $status->[0], $status_descr{$status->[0]}, $status->[1]; $row++; } -print "</table></div>\n"; -print end_html; +print INDEX "</table></div>\n"; +print INDEX end_html; +close INDEX; + +!system "rsync", "-q", "-r", "--chmod=+r", "--exclude=OLD/", "$dir/", "$dest/data" or die "rsync failed: $?"; +rename "$dest/index.html.new", "$dest/index.html" or die "failed to update index.html";

1 0

Gustavo Henrique Milaré : taskmgr: Fixed Portuguese (Brazilian) translation.
by Alexandre Julliard 08 Jul '10

08 Jul '10

Module: wine Branch: master Commit: 3bc53addbf2c1a12f1fd6a0cc3fa353d98fea2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc53addbf2c1a12f1fd6a0cc… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jul 8 11:18:29 2010 -0300 taskmgr: Fixed Portuguese (Brazilian) translation. --- programs/taskmgr/Pt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/Pt.rc b/programs/taskmgr/Pt.rc index 57d3ec3..bf0f71d 100644 --- a/programs/taskmgr/Pt.rc +++ b/programs/taskmgr/Pt.rc @@ -745,7 +745,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "Não actualiza automaticamente" + ID_VIEW_UPDATESPEED_PAUSED "Não atualiza automaticamente" ID_WINDOWS_TILEHORIZONTALLY "Organiza as janelas horizontalmente pela área de trabalho" ID_WINDOWS_TILEVERTICALLY "Organiza as janelas verticalmente pela área de trabalho"

1 0

Gustavo Henrique Milaré : shdoclc: Fix Portuguese translation.
by Alexandre Julliard 08 Jul '10

08 Jul '10

Module: wine Branch: master Commit: 38d4034d94780b1e80676294833d088153ab187b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d4034d94780b1e806762948… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jul 8 12:20:42 2010 -0300 shdoclc: Fix Portuguese translation. --- dlls/shdoclc/Pt.rc | 218 ++++++++++++++++++++++++++-------------------------- 1 files changed, 109 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38d4034d94780b1e80676…

1 0

Paul Vriens : comdlg32: Prevent a NULL pointer dereference (Coverity).
by Alexandre Julliard 08 Jul '10

08 Jul '10

Module: wine Branch: master Commit: 902cce122a226282b3e6b1c52c7851b85672aaa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902cce122a226282b3e6b1c52… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 8 19:50:26 2010 +0200 comdlg32: Prevent a NULL pointer dereference (Coverity). --- dlls/comdlg32/fontdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index ad580d5..6d3ee73 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -903,7 +903,6 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO int i; long l; HDC hdc; - LPLOGFONTW lpxx=lpcf->lpLogFont; if (!lpcf) return FALSE; @@ -965,6 +964,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO { WCHAR str[256]; WINDOWINFO wininfo; + LPLOGFONTW lpxx=lpcf->lpLogFont; TRACE("WM_COMMAND/cmb2,3 =%08lX\n", lParam); i=SendDlgItemMessageW(hDlg,cmb1,CB_GETCURSEL,0,0);

1 0

Louis Lenders : include: Add EnumDisplaySettingsEx flags.
by Alexandre Julliard 08 Jul '10

08 Jul '10

Module: wine Branch: master Commit: 4afb19910566b056a4929cb535cfcd140b73fe16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afb19910566b056a4929cb53… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jul 8 09:58:23 2010 +0200 include: Add EnumDisplaySettingsEx flags. --- include/winuser.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 1a0ea5a..d4920c2 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1501,6 +1501,9 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define ENUM_CURRENT_SETTINGS ((DWORD) -1) #define ENUM_REGISTRY_SETTINGS ((DWORD) -2) +#define EDS_RAWMODE 0x00000002 +#define EDS_ROTATEDMODE 0x00000004 + /* Used for PrintWindow */ #define PW_CLIENTONLY 0x00000001

1 0

Louis Lenders : include: Add dmDisplayOrientation definitions.
by Alexandre Julliard 08 Jul '10

08 Jul '10

Module: wine Branch: master Commit: bec1720cd6b6a9eba94b8f519a32021dd3c67cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec1720cd6b6a9eba94b8f519… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jul 8 10:11:14 2010 +0200 include: Add dmDisplayOrientation definitions. --- include/wingdi.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index e7aafb2..53db856 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -2965,6 +2965,8 @@ DECL_WINELIB_TYPE_AW(LPDEVMODE) #define DM_PAPERWIDTH 0x00000008L #define DM_SCALE 0x00000010L #define DM_POSITION 0x00000020L +#define DM_NUP 0x00000040L +#define DM_DISPLAYORIENTATION 0x00000080L #define DM_COPIES 0x00000100L #define DM_DEFAULTSOURCE 0x00000200L #define DM_PRINTQUALITY 0x00000400L @@ -3174,6 +3176,11 @@ DECL_WINELIB_TYPE_AW(LPDEVMODE) #define DMDITHER_GRAYSCALE 5 #define DMDITHER_USER 256 +#define DMDO_DEFAULT 0 +#define DMDO_90 1 +#define DMDO_180 2 +#define DMDO_270 3 + typedef struct { INT cbSize;

1 0

Jörg Höhle : kernel32/tests: Skip fewer tests on Win9x.
by Alexandre Julliard 08 Jul '10

08 Jul '10

Module: wine Branch: master Commit: cdc120d5e59e9634c9b7538f5f97876a3fb3becb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc120d5e59e9634c9b7538f5… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jul 8 01:43:05 2010 +0200 kernel32/tests: Skip fewer tests on Win9x. --- dlls/kernel32/tests/volume.c | 98 ++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdc120d5e59e9634c9b75…

1 0

Henri Verbeet : wined3d: Invalidate STATE_STREAMSRC in IWineD3DDeviceImpl_EvictManagedResources().
by Alexandre Julliard 08 Jul '10

08 Jul '10

Module: wine Branch: master Commit: 3ecaa4a41adc3f910792ace10bca59726c37ef69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ecaa4a41adc3f910792ace10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 8 12:20:57 2010 +0200 wined3d: Invalidate STATE_STREAMSRC in IWineD3DDeviceImpl_EvictManagedResources(). --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7eb9153..ecd2919 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6174,6 +6174,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EvictManagedResources(IWineD3DDevice *i TRACE("iface %p.\n", iface); IWineD3DDevice_EnumResources(iface, evict_managed_resource, NULL); + /* Invalidate stream sources, the buffer(s) may have been evicted. */ + IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *)iface, STATE_STREAMSRC); + return WINED3D_OK; }

1 0

Igor Paliychuk : comdlg32: Ukrainian translation update.
by Alexandre Julliard 08 Jul '10

08 Jul '10

Module: wine Branch: master Commit: 1c52d52f1e4ac138f805b9b0809968d2a4db7638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c52d52f1e4ac138f805b9b08… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Thu Jul 8 11:29:06 2010 +0300 comdlg32: Ukrainian translation update. --- dlls/comdlg32/cdlg_Uk.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_Uk.rc b/dlls/comdlg32/cdlg_Uk.rc index 14a8f1d..d0f6edf 100644 --- a/dlls/comdlg32/cdlg_Uk.rc +++ b/dlls/comdlg32/cdlg_Uk.rc @@ -54,7 +54,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�� ..." FONT 8, "MS Shell Dlg" { - LTEXT "&&��'� ��:", 1090, 6, 6, 76, 9 + LTEXT "&��'� ��:", 1090, 6, 6, 76, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&��:", -1, 110, 6, 92, 9 @@ -313,7 +313,7 @@ BEGIN LTEXT "��&��:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "��", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "�&��", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "�&��", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "��&��", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "��", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "�&��:", stc15, 88, 172, 21, 8 @@ -460,7 +460,7 @@ STRINGTABLE DISCARDABLE /* Color names */ IDS_COLOR_MAROON "��" IDS_COLOR_GREEN "��" IDS_COLOR_OLIVE "��" - IDS_COLOR_NAVY "��" + IDS_COLOR_NAVY "��-��" IDS_COLOR_PURPLE "��" IDS_COLOR_TEAL "��-��" IDS_COLOR_GRAY "ѳ��"

1 0

Igor Paliychuk : winemine: Add Ukrainian translation.
by Alexandre Julliard 08 Jul '10

08 Jul '10

Module: wine Branch: master Commit: ac51088a70809d8881ea0078c9c17a43eb235a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac51088a70809d8881ea0078c… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Thu Jul 8 11:15:18 2010 +0300 winemine: Add Ukrainian translation. --- programs/winemine/Makefile.in | 1 + programs/winemine/Uk.rc | 98 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 0 deletions(-) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 33e7890..059f137 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -32,6 +32,7 @@ RC_SRCS = \ Si.rc \ Sv.rc \ Tr.rc \ + Uk.rc \ Zh.rc \ rsrc.rc diff --git a/programs/winemine/Uk.rc b/programs/winemine/Uk.rc new file mode 100644 index 0000000..e64fc0c --- /dev/null +++ b/programs/winemine/Uk.rc @@ -0,0 +1,98 @@ +/* + * WineMine + * Ukrainian Language Support + * + * Copyright 2000 Joshua Thielen + * Copyright 2003 Marcelo Duarte + * Copyright 2010 Igor Paliychuk + * + * 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 + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE { + IDS_APPNAME, "WineMine" + IDS_NOBODY, "Nobody" + IDS_ABOUT, "Copyright 2000 Joshua Thielen" +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Гра" { + MENUITEM "&Нова\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Знаки питання", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "Н&овачок", IDM_BEGINNER + MENUITEM "&Майстер", IDM_ADVANCED + MENUITEM "&Експерт", IDM_EXPERT + MENUITEM "&Свої параметри...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Вихід\tAlt+X", IDM_EXIT + } + POPUP "&Довідка" { + MENUITEM "&Кращий час...", IDM_TIMES + MENUITEM "&Про програму", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Кращий час" +{ + GROUPBOX "Кращий час", -1, 10, 10, 140, 45 + LTEXT "Новачок", -1, 20, 20, 40, 8 + LTEXT "Майстер", -1, 20, 30, 40, 8 + LTEXT "Експерт", -1, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Вітання!" +{ + LTEXT "Введіть ваше ім'я", -1, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Свої параметри" +{ + LTEXT "Рядків", -1, 5, 5, 30, 10 + LTEXT "Стовпців", -1, 5, 35, 30, 10 + LTEXT "Мін", -1, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Скасувати", IDCANCEL, 40, 50, 50, 15 +}

1 0