June 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32/tests: Add more systematic tests to validate the DDE client-side A<-> W conversions.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: f5f93d459e5b56539bf545a6a368fd96f14b0e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f93d459e5b56539bf545a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 23 14:19:51 2010 +0200 user32/tests: Add more systematic tests to validate the DDE client-side A<->W conversions. --- dlls/user32/tests/dde.c | 439 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 363 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5f93d459e5b56539bf54…

1 0

Hans Leidekker : msi: Avoid a crash when the cabinet file must be downloaded.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 2c20c35d3ca35e0c516658f22415b83c9c67ece7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c20c35d3ca35e0c516658f22… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 23 10:44:26 2010 +0200 msi: Avoid a crash when the cabinet file must be downloaded. Fixes a regression caused by e5869d5d5c8f01b140ac5fba1044f3c10975612c. --- dlls/msi/media.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index b455775..6dc262c 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -785,13 +785,17 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) { WCHAR temppath[MAX_PATH], *p; - msi_download_file(cabinet_file, temppath); + rc = msi_download_file(cabinet_file, temppath); + if (rc != ERROR_SUCCESS) + { + ERR("Failed to download %s (%u)\n", debugstr_w(cabinet_file), rc); + msi_free(cabinet_file); + return rc; + } if ((p = strrchrW(temppath, '\\'))) *p = 0; - - msi_free(mi->sourcedir); strcpyW(mi->sourcedir, temppath); msi_free(mi->cabinet); - strcpyW(mi->cabinet, p + 1); + mi->cabinet = strdupW(p + 1); msi_free(cabinet_file); return ERROR_SUCCESS;

1 0

Michael Stefaniuc : notepad: Fix an error in the Wallon resource.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: bd007372d26c0aa43b9241029e845de7fec7b2e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd007372d26c0aa43b9241029… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 23 11:13:01 2010 +0200 notepad: Fix an error in the Wallon resource. Translation by David Estebanez. --- programs/notepad/Wa.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Wa.rc b/programs/notepad/Wa.rc index 1856490..85c49c5 100644 --- a/programs/notepad/Wa.rc +++ b/programs/notepad/Wa.rc @@ -57,6 +57,7 @@ POPUP "&Candj POPUP "C&wer�" { MENUITEM "Cwer�...", CMD_SEARCH MENUITEM "&Sh�vant\tF3", CMD_SEARCH_NEXT + MENUITEM "&Replaec�...\tCtrl+H", CMD_REPLACE } POPUP "&Aide" { MENUITEM "�&dvins", CMD_HELP_CONTENTS

1 0

Michael Stefaniuc : notepad: Fix an error in the Chinese (Simplified) resource.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 98c2a1ee816f5e2b0263e6fb3a828e256f164e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c2a1ee816f5e2b0263e6fb3… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 23 11:13:16 2010 +0200 notepad: Fix an error in the Chinese (Simplified) resource. Translation by Donald Park. --- programs/notepad/Zh.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index 005c67d..242eb65 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -55,6 +55,7 @@ POPUP "编辑(&E)" { POPUP "搜索(&S)" { MENUITEM "搜索(&S)...", CMD_SEARCH MENUITEM "搜索下一个(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "替换...\tCtrl+H", CMD_REPLACE } POPUP "帮助(&H)" { MENUITEM "内容(&C)", CMD_HELP_CONTENTS

1 0

Luca Bennati : cmd: Update Italian translation.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 0e63d955d6fe7f4cf61cd1d0dd4865a25f14ddd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e63d955d6fe7f4cf61cd1d0d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Jun 22 23:38:53 2010 +0200 cmd: Update Italian translation. --- programs/cmd/It.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/It.rc b/programs/cmd/It.rc index ecccebe..c503cd1 100644 --- a/programs/cmd/It.rc +++ b/programs/cmd/It.rc @@ -113,8 +113,8 @@ MOVE fallisce se la nuova e la vecchia locazione sono su lettere di unità DOS d WCMD_PATH, "PATH mostra o cambia il percorso di ricerca di cmd.\n\ \n\ -Usando PATH, verrà mostrato la configurazione corrente di PATH (inizialmente questa è\n\ -il valore nel tuo file wine.conf). Per cambiarla, fai seguire al\n\ +Usando PATH, verrà mostrato l'impostazione corrente di PATH (il cui valore è preso\n\ +inizialmente dal registro). Per cambiarla, fai seguire al\n\ comando PATH il nuovo valore.\n\ \n\ È anche possibile modificare il PATH usando la variabile d'ambiente\n\

1 0

Michael Stefaniuc : serialui: Add the Romanian translation.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: ea8313b1c1e9bb44253e0889893f2e6b89bf4385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8313b1c1e9bb44253e08898… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 23 01:14:16 2010 +0200 serialui: Add the Romanian translation. Translations by Claudia Cotună and Paul Chitescu. --- dlls/serialui/Makefile.in | 1 + dlls/serialui/Ro.rc | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 95a04f3..b293921 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -28,6 +28,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc \ Sv.rc \ diff --git a/dlls/serialui/Ro.rc b/dlls/serialui/Ro.rc new file mode 100644 index 0000000..1fe3981 --- /dev/null +++ b/dlls/serialui/Ro.rc @@ -0,0 +1,45 @@ +/* + * Copyright 2000 Mike McCormack + * Copyright 2010 Claudia Cotună + * Paul Chitescu + * Michael Stefaniuc + * + * 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 "serialui.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Proprietăți pentru " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Rata de transfer", -1,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Paritate", -1,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Controlul fluxului", -1,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Biţi de date", -1,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Biţi de stop", -1,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK,30,138,50,14 + PUSHBUTTON "Renunță", IDCANCEL,85,138,50,14 +END

1 0

André Hentschel : winemaker: Warn on include path starting with drive letter.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 02efd5a7c0092fa48c0ce49c0e7352ec33fc1c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=02efd5a7c0092fa48c0ce49c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 18:01:13 2010 +0200 winemaker: Warn on include path starting with drive letter. --- tools/winemaker | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 78034fa..0e34245 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -670,7 +670,11 @@ sub source_scan_project_file($$$) # Additional Include Directories $sfilet=$1; $sfilet=~s/\\/\//g; - push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$sfilet." "; + if ($sfilet=~/^\w:/) { + print STDERR "warning: Can't fix path $sfilet\n" + } else { + push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$sfilet." "; + } } elsif (/^U\s*\"(.*)\"/) { # Undefines a previously defined symbol $prj_target_cflags.="-U".$1." ";

1 0

André Hentschel : winemaker: Don' t use deprecated -mcpu option.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: f10513b2f822291d03cdcb2ebe43cdf316ed76a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f10513b2f822291d03cdcb2eb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 18:01:20 2010 +0200 winemaker: Don't use deprecated -mcpu option. --- tools/winemaker | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 0e34245..64cf54b 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -691,19 +691,19 @@ sub source_scan_project_file($$$) # this option is always present and is already specified in the suffix rules } elsif (/^GB$/) { # Blend Optimization - $prj_target_cflags.="-mcpu=pentiumpro -D_M_IX86=500 "; + $prj_target_cflags.="-march=pentiumpro -D_M_IX86=500 "; } elsif (/^G6$/) { # Pentium Pro Optimization $prj_target_cflags.="-march=pentiumpro -D_M_IX86=600 "; } elsif (/^G5$/) { # Pentium Optimization - $prj_target_cflags.="-mcpu=pentium -D_M_IX86=500 "; + $prj_target_cflags.="-march=pentium -D_M_IX86=500 "; } elsif (/^G3$/) { # 80386 Optimization - $prj_target_cflags.="-mcpu=i386 -D_M_IX86=300 "; + $prj_target_cflags.="-march=i386 -D_M_IX86=300 "; } elsif (/^G4$/) { # 80486 Optimization - $prj_target_cflags.="-mcpu=i486 -D_M_IX86=400 "; + $prj_target_cflags.="-march=i486 -D_M_IX86=400 "; } elsif (/^Yc/) { # Create Precompiled Header } elsif (/^Yu/) {

1 0

André Hentschel : winemaker: Ignore files not found by the search function.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: f4679761b7a6385452bba6a12db9b1e3eae5ed06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4679761b7a6385452bba6a12… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 18:01:07 2010 +0200 winemaker: Ignore files not found by the search function. --- tools/winemaker | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index bed499d..78034fa 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -782,6 +782,7 @@ sub source_scan_project_file($$$) } elsif (/^SOURCE=(.*)$/) { my @components=split /[\/\\]+/, $1; $sfilet=search_from($path, \@components); + if (!defined $sfilet) { next; } if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { push @sources_c,$sfilet; } elsif ($sfilet =~ /\.(cpp|cxx)$/i) {

1 0

André Hentschel : uxtheme: Quiet a noisy fixme.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: e17be10d44faa32a18dd88d06e8cfddbf3972e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17be10d44faa32a18dd88d06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 21:41:23 2010 +0200 uxtheme: Quiet a noisy fixme. --- dlls/uxtheme/buffer.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index af004d0..f4d8229 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -61,8 +61,14 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC hdcTarget, BP_PAINTPARAMS *pPaintParams, HDC *phdc) { - FIXME("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat, + static int i; + + TRACE("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat, pPaintParams, phdc); + + if (!i++) + FIXME("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat, + pPaintParams, phdc); return NULL; }

1 0