June 2008 - Wine-commits - list.winehq.org

Mikołaj Zalewski : regedit: Update Polish translation.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: b29e46c67bd37d5b79ba47bc62f07348f34badec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29e46c67bd37d5b79ba47bc6… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jun 5 23:19:56 2008 +0200 regedit: Update Polish translation. --- programs/regedit/Pl.rc | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/programs/regedit/Pl.rc b/programs/regedit/Pl.rc index c07ddf8..e6048c7 100644 --- a/programs/regedit/Pl.rc +++ b/programs/regedit/Pl.rc @@ -106,6 +106,7 @@ BEGIN MENUITEM "U&su�\tDel", ID_EDIT_DELETE MENUITEM "Z&mie� nazw�\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Eksportuj...", ID_EDIT_EXPORT MENUITEM "&Kopiuj nazw� klucza", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Znajd�...\tCtrl+F", ID_EDIT_FIND, GRAYED @@ -128,7 +129,7 @@ BEGIN EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 END -IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 +IDD_FIND DIALOG DISCARDABLE 22, 17, 220, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Wyszukaj w rejestrze" FONT 8, "MS Shell Dlg" @@ -140,8 +141,8 @@ BEGIN CHECKBOX "Nazwach warto�ci", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Tre�ci warto�ci", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Tylko pe�ne dopasowanie", IDC_FIND_WHOLE, 5, 70, 120, 10, WS_TABSTOP | BS_AUTOCHECKBOX - DEFPUSHBUTTON "Znajd�",IDOK,175,5,30,11,WS_GROUP - PUSHBUTTON "Zamknij",IDCANCEL,175,22,30,11, WS_GROUP + DEFPUSHBUTTON "Znajd�",IDOK,175,5,40,15,WS_GROUP + PUSHBUTTON "Zamknij",IDCANCEL,175,24,40,15, WS_GROUP END IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 @@ -151,8 +152,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nazwa:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,140,40,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,40,30,11, WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,36,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,165,36,40,15, WS_GROUP END IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 @@ -162,8 +163,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nazwa:",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,140,73,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,73,30,11, WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,72,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,165,72,40,15, WS_GROUP END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 @@ -175,8 +176,8 @@ BEGIN EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED LTEXT "Warto��:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,60,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,56,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,165,56,40,15,WS_GROUP END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 @@ -191,21 +192,21 @@ BEGIN GROUPBOX "System", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX AUTORADIOBUTTON "Szesnastkowy", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP AUTORADIOBUTTON "Dziesi�tny", IDC_DWORD_DEC, 130, 52, 60, 10, WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,80,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,78,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,165,78,40,15,WS_GROUP END -IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100 +IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Edycja danej binarnej" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nazwa:",IDC_STATIC,5,5,119,8 - EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Warto��:",IDC_STATIC,5,30,90,8 - CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 - DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,80,30,11,WS_GROUP + CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,160,40 + DEFPUSHBUTTON "OK",IDOK,80,83,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,125,83,40,15,WS_GROUP END IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 @@ -217,8 +218,8 @@ BEGIN EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Warto��:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN - DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,160,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,156,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,165,156,40,15,WS_GROUP END /*

1 0

Alexandre Julliard : winetest: Store the missing dll information in the summary file.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: tools Branch: master Commit: e080506243bb0546729e8245cb39c4376260959e URL: http://source.winehq.org/git/tools.git/?a=commit;h=e080506243bb0546729e8245… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 5 16:13:45 2008 +0200 winetest: Store the missing dll information in the summary file. Remove some more support for obsolete file formats. --- winetest/dissect | 12 ++++-------- winetest/gather | 23 +++++++---------------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 0df0f56..66a3bd4 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -183,6 +183,10 @@ while ($_ = <IN>) { s/\r+$//; last if (!/^\s+([^ =]+)=(.*)\r?$/); $dllinfo{$1} = { version => $2 }; + if ($2 eq "dll is missing") + { + print SUM "- $1 - missing - - - - -\n"; + } } /^Test output:/ or mydie "no test header: $_"; @@ -334,14 +338,6 @@ for (my $i = 0; $i <= $#boxes; $i++) close FILE or mydie "error writing to '$tmpdir/$boxes[$i]->{id}.html': $!\n"; } -if (%dllinfo) { - open DLLINFO, ">$tmpdir/dllinfo.txt" or mydie "unable to open '$tmpdir/dllinfo.txt' for writing: $!\n"; - foreach my $dll (sort keys %dllinfo) { - print DLLINFO "$dll=$dllinfo{$dll}->{version}\n"; - } - close DLLINFO or mydie "error writing to '$tmpdir/dllinfo.txt': $!\n"; -} - my $builddir = "$datadir/$testbuild"; foreach ($datadir, $builddir) { if (!(-d $_ || mkdir $_)) { diff --git a/winetest/gather b/winetest/gather index 26dacb7..8ea31c7 100755 --- a/winetest/gather +++ b/winetest/gather @@ -122,7 +122,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { } my $report = { group => $group}; - # Read the dll information if present (newer type reports) + # Read the dll information if present my $dllinfo = "$datadir/$build/$dir/dllinfo.txt"; if (open DLLINFO, "<$dllinfo") { while ($_ = <DLLINFO>) { @@ -153,15 +153,14 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { $source, $rev) = split; my $testname = "$dll:$unit"; - $alltests{$testname} = $source; - - # Leave this in for older type reports - if ($unit =~ /_dll_missing/ or - ($count eq "0" and exists $report->{dllmissing}->{$dll})) { - # Mark the dll as missing on this system + if ($count eq "missing") + { $report->{dllmissing}->{$dll} = 1; next; } + + $alltests{$testname} = $source; + if ($count eq "failed") { if ($todos eq "crash") { $report->{$testname} = { status => "winetest crash" }; @@ -331,21 +330,13 @@ sub build_header_footer($) <a href=\"$report->{dir}/dllinfo.html\">[info]</a> <a href=\"$report->{dir}/report.html\">[file]</a> EOF - # If dllinfo.txt exist we use a different layout (new style report) - } elsif (-r "$datadir/$build/$report->{dir}/dllinfo.txt") { + } else { $msg = <<"EOF"; $group->{name} <a href=\"$report->{dir}/version.txt\">$report->{tag}</a> <a href=\"$report->{dir}/dllinfo.txt\">[info]</a> <a href=\"$report->{dir}/report\">[file]</a> EOF - } else { - $msg = <<"EOF"; - $group->{name} - <a href=\"$report->{dir}/build.txt\">$report->{tag}</a> - <a href=\"$report->{dir}/version.txt\">[info]</a> - <a href=\"$report->{dir}/report\">[file]</a> -EOF } chop $msg; }

1 0

Francois Gouget : gdi32/tests: Take into account several Win9x bugs in GetObject().
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: 8f91acc8946688d77d62d61455a7a019a5abc612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f91acc8946688d77d62d6145… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 5 14:58:51 2008 +0200 gdi32/tests: Take into account several Win9x bugs in GetObject(). --- dlls/gdi32/tests/bitmap.c | 50 ++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 06b1672..05f57e6 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -70,13 +70,15 @@ static INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ) static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHEADER *bmih) { BITMAP bm; + BITMAP bma[2]; INT ret, width_bytes; char buf[512], buf_cmp[512]; + DWORD gle; ret = GetObject(hbm, sizeof(bm), &bm); ok(ret == sizeof(bm), "GetObject returned %d\n", ret); - ok(bm.bmType == 0, "wrong bm.bmType %d\n", bm.bmType); + ok(bm.bmType == 0 || broken(bm.bmType == 21072 /* Win9x */), "wrong bm.bmType %d\n", bm.bmType); ok(bm.bmWidth == bmih->biWidth, "wrong bm.bmWidth %d\n", bm.bmWidth); ok(bm.bmHeight == bmih->biHeight, "wrong bm.bmHeight %d\n", bm.bmHeight); width_bytes = BITMAP_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel); @@ -88,8 +90,10 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE assert(sizeof(buf) >= bm.bmWidthBytes * bm.bmHeight); assert(sizeof(buf) == sizeof(buf_cmp)); + SetLastError(0xdeadbeef); ret = GetBitmapBits(hbm, 0, NULL); - ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); + gle=GetLastError(); + ok(ret == bm.bmWidthBytes * bm.bmHeight || (ret == 0 && gle == ERROR_INVALID_PARAMETER /* Win9x */), "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); memset(buf_cmp, 0xAA, sizeof(buf_cmp)); memset(buf_cmp, 0, bm.bmWidthBytes * bm.bmHeight); @@ -100,20 +104,24 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match\n"); /* test various buffer sizes for GetObject */ - ret = GetObject(hbm, 0, NULL); - ok(ret == sizeof(bm), "wrong size %d\n", ret); - - ret = GetObject(hbm, sizeof(bm) * 2, &bm); - ok(ret == sizeof(bm), "wrong size %d\n", ret); + ret = GetObject(hbm, sizeof(*bma) * 2, bma); + ok(ret == sizeof(*bma) || broken(ret == sizeof(*bma) * 2 /* Win9x */), "wrong size %d\n", ret); ret = GetObject(hbm, sizeof(bm) / 2, &bm); - ok(ret == 0, "%d != 0\n", ret); + ok(ret == 0 || broken(ret == sizeof(bm) / 2 /* Win9x */), "%d != 0\n", ret); ret = GetObject(hbm, 0, &bm); ok(ret == 0, "%d != 0\n", ret); ret = GetObject(hbm, 1, &bm); - ok(ret == 0, "%d != 0\n", ret); + ok(ret == 0 || broken(ret == 1 /* Win9x */), "%d != 0\n", ret); + + /* Don't trust Win9x not to try to write to NULL */ + if (ret == 0) + { + ret = GetObject(hbm, 0, NULL); + ok(ret == sizeof(bm), "wrong size %d\n", ret); + } } static void test_createdibitmap(void) @@ -275,7 +283,9 @@ static INT DIB_GetWidthBytes( int width, int bpp ) static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER *bmih) { BITMAP bm; + BITMAP bma[2]; DIBSECTION ds; + DIBSECTION dsa[2]; INT ret, bm_width_bytes, dib_width_bytes; BYTE *buf; @@ -309,27 +319,30 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER /* test various buffer sizes for GetObject */ memset(&ds, 0xAA, sizeof(ds)); - ret = GetObject(hbm, sizeof(bm) * 2, &bm); - ok(ret == sizeof(bm), "wrong size %d\n", ret); + ret = GetObject(hbm, sizeof(*bma) * 2, bma); + ok(ret == sizeof(*bma) || broken(ret == sizeof(*bma) * 2 /* Win9x */), "wrong size %d\n", ret); ok(bm.bmWidth == bmih->biWidth, "wrong bm.bmWidth %d\n", bm.bmWidth); ok(bm.bmHeight == bmih->biHeight, "wrong bm.bmHeight %d\n", bm.bmHeight); ok(bm.bmBits == bits, "wrong bm.bmBits %p != %p\n", bm.bmBits, bits); ret = GetObject(hbm, sizeof(bm) / 2, &bm); - ok(ret == 0, "%d != 0\n", ret); + ok(ret == 0 || broken(ret == sizeof(bm) / 2 /* Win9x */), "%d != 0\n", ret); ret = GetObject(hbm, 0, &bm); ok(ret == 0, "%d != 0\n", ret); ret = GetObject(hbm, 1, &bm); - ok(ret == 0, "%d != 0\n", ret); + ok(ret == 0 || broken(ret == 1 /* Win9x */), "%d != 0\n", ret); /* test various buffer sizes for GetObject */ ret = GetObject(hbm, 0, NULL); ok(ret == sizeof(bm), "wrong size %d\n", ret); + ret = GetObject(hbm, sizeof(*dsa) * 2, dsa); + ok(ret == sizeof(*dsa) || broken(ret == sizeof(*dsa) * 2 /* Win9x */), "wrong size %d\n", ret); + memset(&ds, 0xAA, sizeof(ds)); - ret = GetObject(hbm, sizeof(ds) * 2, &ds); + ret = GetObject(hbm, sizeof(ds), &ds); ok(ret == sizeof(ds), "wrong size %d\n", ret); ok(ds.dsBm.bmBits == bits, "wrong bm.bmBits %p != %p\n", ds.dsBm.bmBits, bits); @@ -972,6 +985,7 @@ static void test_bitmap(void) HBITMAP hbmp, hbmp_old; HDC hdc; BITMAP bm; + BITMAP bma[2]; INT ret; hdc = CreateCompatibleDC(0); @@ -1055,17 +1069,17 @@ static void test_bitmap(void) ok(hbmp_old == hbmp, "wrong old bitmap %p\n", hbmp_old); /* test various buffer sizes for GetObject */ - ret = GetObject(hbmp, sizeof(bm) * 2, &bm); - ok(ret == sizeof(bm), "wrong size %d\n", ret); + ret = GetObject(hbmp, sizeof(*bma) * 2, bma); + ok(ret == sizeof(*bma) || broken(ret == sizeof(*bma) * 2 /* Win9x */), "wrong size %d\n", ret); ret = GetObject(hbmp, sizeof(bm) / 2, &bm); - ok(ret == 0, "%d != 0\n", ret); + ok(ret == 0 || broken(ret == sizeof(bm) / 2 /* Win9x */), "%d != 0\n", ret); ret = GetObject(hbmp, 0, &bm); ok(ret == 0, "%d != 0\n", ret); ret = GetObject(hbmp, 1, &bm); - ok(ret == 0, "%d != 0\n", ret); + ok(ret == 0 || broken(ret == 1 /* Win9x */), "%d != 0\n", ret); DeleteObject(hbmp); DeleteDC(hdc);

1 0

Francois Gouget : resources: Fix some overly long '...' instances.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: a9037a65924583f5b8fc2205f089c7e9f9a1e7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9037a65924583f5b8fc2205f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 5 14:52:48 2008 +0200 resources: Fix some overly long '...' instances. --- dlls/gphoto2.ds/gphoto2_Da.rc | 2 +- dlls/gphoto2.ds/gphoto2_En.rc | 2 +- dlls/gphoto2.ds/gphoto2_Fr.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ko.rc | 2 +- dlls/gphoto2.ds/gphoto2_Nl.rc | 2 +- dlls/gphoto2.ds/gphoto2_Pl.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ru.rc | 2 +- dlls/gphoto2.ds/gphoto2_Si.rc | 4 ++-- dlls/gphoto2.ds/gphoto2_Sv.rc | 2 +- dlls/sane.ds/sane_De.rc | 2 +- dlls/sane.ds/sane_En.rc | 2 +- dlls/sane.ds/sane_Fi.rc | 2 +- dlls/sane.ds/sane_Fr.rc | 2 +- dlls/sane.ds/sane_Nl.rc | 2 +- dlls/sane.ds/sane_Pl.rc | 2 +- dlls/sane.ds/sane_Ro.rc | 2 +- dlls/sane.ds/sane_Ru.rc | 2 +- dlls/sane.ds/sane_Si.rc | 2 +- dlls/sane.ds/sane_Sv.rc | 2 +- dlls/shdoclc/Bg.rc | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9037a65924583f5b8fc2…

1 0

Francois Gouget : start: Some updates and fixes to the French translation.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: 43a46a1fa20194cf51405a7887b08ce39df980b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a46a1fa20194cf51405a788… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 5 14:50:49 2008 +0200 start: Some updates and fixes to the French translation. --- programs/start/Fr.rc | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/start/Fr.rc b/programs/start/Fr.rc index ef875b9..b9c800b 100644 --- a/programs/start/Fr.rc +++ b/programs/start/Fr.rc @@ -46,25 +46,27 @@ sous certaines condition; lancez 'start /L' pour les détails. \n\ " STRING_LICENSE, "start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ -Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou\n\ -e modifier suivant les termes de la Licence Générale Publique Limitée GNU \n\ +Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou \n\ +le modifier suivant les termes de la Licence Générale Publique Limitée GNU \n\ telle que publiée par la Free Software Foundation ; soit la version 2.1 \n\ de la License, soit (à votre gré) toute version ultérieure. \n\ \n\ -Wine est distribué dans l’espoir qu'il sera utile, mais \n\ -SANS AUCUNE GARANTIE : sans même la garantie implicite de \n\ -COMMERCIALISABILITÉ ou d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \n\ +Ce programme est distribué dans l’espoir qu'il sera utile, mais \n\ +SANS AUCUNE GARANTIE : sans même la garantie implicite de \n\ +COMMERCIALISABILITÉ ou d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \n\ la Licence Générale Publique Limitée pour plus de détails. \n\ \n\ Vous devriez avoir reçu une copie de la Licence Générale Publique Limitée \n\ -GNU avec cette bibliothèque ; si ce n’est pas le cas, écrivez à la : \n\ -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, \n\ +GNU avec ce programme ; si ce n’est pas le cas, écrivez à la : \n\ +Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, \n\ MA 02110-1301, USA. \n\ \n\ -Référez-vous au fichier COPYING.LIB pour des informations sur la licence. \n\ +Référez-vous au fichier COPYING.LIB pour plus d’informations sur la licence. \n\ " STRING_EXECFAIL "Le programme n'a pas pu être lancé, ou il n'y a pas de programme associé avec le fichier spécifié.\nShellExecuteEx a échoué" + +STRING_UNIXFAIL, "Le nom de fichier Unix spécifié n'a pas pu être converti en nom de fichier DOS." } #pragma code_page(default) /* Return to default encoding */

1 0

Francois Gouget : Fix the resources to remove extraneous spaces in '...'.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: 39cb432b683f873fe488fe4b13b503bf6d1a07da URL: http://source.winehq.org/git/wine.git/?a=commit;h=39cb432b683f873fe488fe4b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 5 14:48:16 2008 +0200 Fix the resources to remove extraneous spaces in '...'. --- dlls/browseui/rsrc_No.rc | 2 +- dlls/comdlg32/cdlg_No.rc | 6 ++-- dlls/gphoto2.ds/gphoto2_No.rc | 4 +- dlls/msacm32/msacm_Da.rc | 2 +- dlls/msacm32/msacm_No.rc | 2 +- dlls/mshtml/No.rc | 4 +- dlls/msvfw32/msvfw32_Da.rc | 4 +- dlls/msvfw32/msvfw32_No.rc | 4 +- dlls/oledlg/oledlg_No.rc | 6 ++-- dlls/sane.ds/sane_No.rc | 2 +- dlls/setupapi/No.rc | 2 +- dlls/shdoclc/Da.rc | 2 +- dlls/shdoclc/No.rc | 34 ++++++++++---------- dlls/shell32/shell32_No.rc | 4 +- dlls/user32/resources/user32_No.rc | 6 ++-- programs/clock/No.rc | 8 ++-- programs/cmd/Da.rc | 2 +- programs/cmd/No.rc | 2 +- programs/cmdlgtst/No.rc | 2 +- programs/notepad/No.rc | 16 +++++----- programs/oleview/No.rc | 12 +++--- programs/progman/No.rc | 24 +++++++------- programs/regedit/Da.rc | 8 ++-- programs/regedit/Ko.rc | 2 +- programs/regedit/Nl.rc | 2 +- programs/regedit/No.rc | 10 +++--- programs/taskmgr/No.rc | 12 +++--- programs/winecfg/No.rc | 12 +++--- programs/winefile/No.rc | 60 ++++++++++++++++++------------------ programs/winhlp32/No.rc | 10 +++--- programs/wordpad/Hu.rc | 22 ++++++------ programs/wordpad/Ko.rc | 22 ++++++------ programs/wordpad/Nl.rc | 22 ++++++------ programs/wordpad/No.rc | 26 ++++++++-------- programs/wordpad/Tr.rc | 26 ++++++++-------- 35 files changed, 192 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39cb432b683f873fe488f…

1 0

Alexandre Julliard : user32/tests: Fix the dde test race correctly this time.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: 14194452a88e727071eb2ae2b6835975b8d193d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14194452a88e727071eb2ae2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 5 12:43:17 2008 +0200 user32/tests: Fix the dde test race correctly this time. --- dlls/user32/tests/dde.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index f64e61d..b9d8a87 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -233,8 +233,8 @@ static void test_msg_server(HANDLE hproc, HANDLE hthread) HWND hwnd; DWORD res; - ResumeThread( hthread ); create_dde_window(&hwnd, "dde_server", dde_server_wndproc); + ResumeThread( hthread ); while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) {

1 0

Alexandre Julliard : shell32: Fixed the French about box.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: c819a87d3380df34ad139ff80f9ffd8b37be76be URL: http://source.winehq.org/git/wine.git/?a=commit;h=c819a87d3380df34ad139ff80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 5 14:07:00 2008 +0200 shell32: Fixed the French about box. --- dlls/shell32/shell32_Fr.rc | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index 994c40f..980e956 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -142,17 +142,18 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 230, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "À propos de %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 70, 12, WS_TABSTOP + PUSHBUTTON "&Licence de Wine...", IDC_ABOUT_LICENSE, 153, 113, 70, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 - LTEXT "Wine est une réalisation de :", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "Wine est une réalisation de :", IDC_ABOUT_WINE_TEXT, 8, 55, 214, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -261,15 +262,15 @@ IDS_LICENSE_CAPTION, "Licence de Wine" IDS_LICENSE, "Wine est un logiciel libre ; vous pouvez le redistribuer et/ou \ le modifier suivant les termes de la Licence Générale Publique Limitée GNU \ -telle que publiée par la Free Software Foundation ; soit la version 2.1\ +telle que publiée par la Free Software Foundation ; soit la version 2.1 \ de la License, soit (à votre gré) toute version ultérieure.\n\n\ Wine est distribué dans l’espoir qu'il sera utile, mais \ SANS AUCUNE GARANTIE : sans même la garantie implicite de \ COMMERCIALISABILITÉ ou d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \ la Licence Générale Publique Limitée pour plus de détails.\n\n\ -Vous devriez avoir reçu une copie de la Licence Générale Publique Limitée\ -GNU avec cette bibliothèque ; si ce n’est pas le cas, écrivez à la :\ -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\ +Vous devriez avoir reçu une copie de la Licence Générale Publique Limitée \ +GNU avec cette bibliothèque ; si ce n’est pas le cas, écrivez à la : \ +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, \ MA 02110-1301, USA." }

1 0

Matthew D'Asaro : mmio: Do not zero current file position whenever mmioSetBuffer is called.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: f684dac0fcacf4412a26bab3ca4f9aff985db6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f684dac0fcacf4412a26bab3c… Author: Matthew D'Asaro <matthew(a)thinkpad.home> Date: Tue Jun 3 19:41:20 2008 -0700 mmio: Do not zero current file position whenever mmioSetBuffer is called. --- dlls/winmm/mmio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index fb19bd4..c2df106 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -585,7 +585,7 @@ static MMRESULT MMIO_SetBuffer(WINE_MMIO* wm, void* pchBuffer, LONG cchBuffer, wm->info.pchNext = wm->info.pchBuffer; wm->info.pchEndRead = wm->info.pchBuffer; wm->info.pchEndWrite = wm->info.pchBuffer + cchBuffer; - wm->info.lBufOffset = 0; + wm->info.lBufOffset = wm->info.lDiskOffset; wm->bBufferLoaded = FALSE; return MMSYSERR_NOERROR;

1 0

Paul Vriens : wintrust/tests: Fix test on win9x.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: b3db514cd5dc8a9fb72a86958182fd1c814dbf2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3db514cd5dc8a9fb72a86958… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jun 5 11:45:25 2008 +0200 wintrust/tests: Fix test on win9x. --- dlls/wintrust/tests/softpub.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 745cbee..45ff421 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -27,6 +27,7 @@ #include <softpub.h> #include <mssip.h> #include <winuser.h> +#include "winnls.h" #include "wine/test.h" @@ -250,9 +251,9 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); if (data.padwTrustStepErrors) { - static const WCHAR notepad[] = { '\\','n','o','t','e','p','a','d','.', - 'e','x','e',0 }; - WCHAR notepadPath[MAX_PATH]; + static const CHAR notepad[] = "\\notepad.exe"; + CHAR notepadPath[MAX_PATH]; + WCHAR notepadPathW[MAX_PATH]; PROVDATA_SIP provDataSIP = { 0 }; static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; @@ -285,9 +286,11 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) /* Crashes ret = funcs->pfnObjectTrust(&data); */ - GetWindowsDirectoryW(notepadPath, MAX_PATH); - lstrcatW(notepadPath, notepad); - fileInfo.pcwszFilePath = notepadPath; + /* Workaround missing W-functions for win9x */ + GetWindowsDirectoryA(notepadPath, MAX_PATH); + lstrcatA(notepadPath, notepad); + MultiByteToWideChar(0, 0, notepadPath, -1, notepadPathW, MAX_PATH); + fileInfo.pcwszFilePath = notepadPathW; /* pfnObjectTrust now crashes unless both pPDSip and psPfns are set */ U(data).pPDSip = &provDataSIP; data.psPfns = (CRYPT_PROVIDER_FUNCTIONS *)funcs;

1 0