wine-commits June 2008

wine-commits@winehq.org

3 participants
944 discussions

Francois Gouget : progman: Update the license and warranty French translation.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 4ddb0a9e8f64386605c56c88b012ec179866bd0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ddb0a9e8f64386605c56c88b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 17:58:46 2008 +0200 progman: Update the license and warranty French translation. --- programs/progman/Fr.rc | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/programs/progman/Fr.rc b/programs/progman/Fr.rc index 39a9be6..91f691f 100644 --- a/programs/progman/Fr.rc +++ b/programs/progman/Fr.rc @@ -222,25 +222,23 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { IDS_LICENSE_CAPTION, "LICENCE" IDS_LICENSE, -"Cette biblioth�que est libre, vous pouvez la redistribuer et/ou \ -la modifier selon les termes de la Licence Publique G�n�rale GNU \ -Limit�e publi�e par la Free Software Foundation (version 2.1 ou \ -bien toute autre version ult�rieure choisie par vous).\n\ -Cette biblioth�que est distribu�e car potentiellement utile, \ -mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris \ -les garanties de commercialisation ou d'adaptation dans un but \ -sp�cifique. Reportez-vous � la Licence Publique G�n�rale GNU \ -Limit�e pour plus de d�tails.\n\ -Vous devez avoir re�u une copie de la Licence Publique G�n�rale \ -GNU Limit�e en m�me temps que cette biblioth�que�; si ce n'est pas \ -le cas, �crivez � la Free Software Foundation, Inc., 51 Franklin St, \ -Fifth Floor, Boston, MA 02111-1301, �tats-Unis." +"Ce programme 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 \ +de la License, soit (� votre gr�) toute version ult�rieure.\n\ +Ce programme 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\ +Vous devriez avoir re�u une copie de la Licence G�n�rale Publique Limit�e \ +GNU avec ce programme�; si ce n'est pas le cas, �crivez � la�: \ +Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, \ +MA 02110-1301, USA." IDS_WARRANTY_CAPTION, "AUCUNE GARANTIE" IDS_WARRANTY, -"Cette biblioth�que est distribu�e car potentiellement utile, \ -mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris \ -les garanties de commercialisation ou d'adaptation dans un but \ -sp�cifique. Reportez-vous � la Licence Publique G�n�rale GNU \ -Limit�e pour plus de d�tails." +"Ce programme 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." }

1 0

Francois Gouget : winecfg: Update the license French translation.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 91423de8f372ea38d7c7caa92909a7d2ce1dec83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91423de8f372ea38d7c7caa92… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 17:58:31 2008 +0200 winecfg: Update the license French translation. --- programs/winecfg/Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 26c0c39..ee8cd9f 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -37,7 +37,7 @@ BEGIN LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - LTEXT "Cette biblioth�que est un logiciel libre�; vous pouvez la redistribuer et/ou la modifier suivant les termes de la Licence G�n�rale Publique Limit�e, telle que publi�e par la Free Software Foundation�; soit la version 2.1 de la License, soit (� votre gr�) toute version ult�rieure." + LTEXT "Ce programme est un logiciel libre�; vous pouvez le redistribuer et/ou le modifier suivant les termes de la Licence G�n�rale Publique Limit�e, telle que publi�e par la Free Software Foundation�; soit la version 2.1 de la License, soit (� votre gr�) toute version ult�rieure." IDC_STATIC,119,44,124,72 END

1 0

Francois Gouget : clock: Update the license and warranty French translation .
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 85bdabeb5a40bd28d34d877094e1d3cfa0329594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85bdabeb5a40bd28d34d87709… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 17:57:45 2008 +0200 clock: Update the license and warranty French translation. --- programs/clock/Fr.rc | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/programs/clock/Fr.rc b/programs/clock/Fr.rc index dc4c1df..be80059 100644 --- a/programs/clock/Fr.rc +++ b/programs/clock/Fr.rc @@ -53,25 +53,23 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { IDS_LICENSE_CAPTION, "LICENCE" IDS_LICENSE, -"Cette biblioth�que est libre, vous pouvez la redistribuer et/ou \ -la modifier selon les termes de la Licence Publique G�n�rale GNU \ -Limit�e publi�e par la Free Software Foundation (version 2.1 ou \ -bien toute autre version ult�rieure choisie par vous).\n\ -Cette biblioth�que est distribu�e car potentiellement utile, \ -mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris \ -les garanties de commercialisation ou d'adaptation dans un but \ -sp�cifique. Reportez-vous � la Licence Publique G�n�rale GNU \ -Limit�e pour plus de d�tails.\n\ -Vous devez avoir re�u une copie de la Licence Publique G�n�rale \ -GNU Limit�e en m�me temps que cette biblioth�que�; si ce n'est pas \ -le cas, �crivez � la Free Software Foundation, Inc., 51 Franklin St, \ -Fifth Floor, Boston, MA 02111-1301, �tats-Unis." +"Ce programme 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 \ +de la License, soit (� votre gr�) toute version ult�rieure.\n\ +Ce programme 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\ +Vous devriez avoir re�u une copie de la Licence G�n�rale Publique Limit�e \ +GNU avec ce programme�; si ce n'est pas le cas, �crivez � la�: \ +Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, \ +MA 02110-1301, USA." IDS_WARRANTY_CAPTION, "AUCUNE GARANTIE" IDS_WARRANTY, -"Cette biblioth�que est distribu�e car potentiellement utile, \ -mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris \ -les garanties de commercialisation ou d'adaptation dans un but \ -sp�cifique. Reportez-vous � la Licence Publique G�n�rale GNU \ -Limit�e pour plus de d�tails." +"Ce programme 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." }

1 0

Francois Gouget : progman: Progman is a program, not a library. So tweak the license and warranty messages accordingly.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: a0be11e3e8eb6a1528fd2f651d6b485603362ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0be11e3e8eb6a1528fd2f651… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 17:57:21 2008 +0200 progman: Progman is a program, not a library. So tweak the license and warranty messages accordingly. --- programs/progman/En.rc | 8 ++++---- programs/progman/Es.rc | 8 ++++---- programs/progman/Ko.rc | 8 ++++---- programs/progman/Nl.rc | 8 ++++---- programs/progman/Pl.rc | 8 ++++---- programs/progman/Si.rc | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/programs/progman/En.rc b/programs/progman/En.rc index e893364..eaa514a 100644 --- a/programs/progman/En.rc +++ b/programs/progman/En.rc @@ -224,21 +224,21 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT { IDS_LICENSE_CAPTION, "LICENSE" IDS_LICENSE, -"This library is free software; you can redistribute it and/or \ +"This program 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.\n\ -This library is distributed in the hope that it will be useful, \ +This program 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.\n\ You should have received a copy of the GNU Lesser General Public \ -License along with this library; if not, write to the Free Software \ +License along with this program; if not, write to the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" IDS_WARRANTY_CAPTION, "NO WARRANTY" IDS_WARRANTY, -"This library is distributed in the hope that it will be useful, \ +"This program 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." diff --git a/programs/progman/Es.rc b/programs/progman/Es.rc index fbcb5df..ea52f6e 100644 --- a/programs/progman/Es.rc +++ b/programs/progman/Es.rc @@ -218,21 +218,21 @@ STRINGTABLE DISCARDABLE { IDS_LICENSE_CAPTION, "LICENCIA" IDS_LICENSE, -"This library is free software; you can redistribute it and/or \ +"This program 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.\n\ -This library is distributed in the hope that it will be useful, \ +This program 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.\n\ You should have received a copy of the GNU Lesser General Public \ -License along with this library; if not, write to the Free Software \ +License along with this program; if not, write to the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" IDS_WARRANTY_CAPTION, "SIN GARANT�A" IDS_WARRANTY, -"This library is distributed in the hope that it will be useful, \ +"This program 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." diff --git a/programs/progman/Ko.rc b/programs/progman/Ko.rc index 600e8e4..ef1bca8 100644 --- a/programs/progman/Ko.rc +++ b/programs/progman/Ko.rc @@ -223,21 +223,21 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL { IDS_LICENSE_CAPTION, "��̼��" IDS_LICENSE, -"This library is free software; you can redistribute it and/or \ +"This program 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.\n\ -This library is distributed in the hope that it will be useful, \ +This program 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.\n\ You should have received a copy of the GNU Lesser General Public \ -License along with this library; if not, write to the Free Software \ +License along with this program; if not, write to the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" IDS_WARRANTY_CAPTION, "�� " IDS_WARRANTY, -"This library is distributed in the hope that it will be useful, \ +"This program 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." diff --git a/programs/progman/Nl.rc b/programs/progman/Nl.rc index 2a59436..b2c4bd2 100644 --- a/programs/progman/Nl.rc +++ b/programs/progman/Nl.rc @@ -222,21 +222,21 @@ IDS_SYMBOLS_ICO, "Pictogrammen (*.ico)" IDS_LICENSE_CAPTION, "LICENTIE" /* Only translated the title, there is no official translation of the LGPL */ IDS_LICENSE, -"This library is free software; you can redistribute it and/or \ +"This program 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.\n\ -This library is distributed in the hope that it will be useful, \ +This program 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.\n\ You should have received a copy of the GNU Lesser General Public \ -License along with this library; if not, write to the Free Software \ +License along with this program; if not, write to the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" IDS_WARRANTY_CAPTION, "GEEN GARANTIE" IDS_WARRANTY, -"This library is distributed in the hope that it will be useful, \ +"This program 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." diff --git a/programs/progman/Pl.rc b/programs/progman/Pl.rc index 3be99a4..515333f 100644 --- a/programs/progman/Pl.rc +++ b/programs/progman/Pl.rc @@ -219,21 +219,21 @@ STRINGTABLE DISCARDABLE { IDS_LICENSE_CAPTION, "LICENCJA" IDS_LICENSE, -"This library is free software; you can redistribute it and/or \ +"This program 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.\n\ -This library is distributed in the hope that it will be useful, \ +This program 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.\n\ You should have received a copy of the GNU Lesser General Public \ -License along with this library; if not, write to the Free Software \ +License along with this program; if not, write to the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" IDS_WARRANTY_CAPTION, "BEZ GWARANCJI" IDS_WARRANTY, -"This library is distributed in the hope that it will be useful, \ +"This program 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." diff --git a/programs/progman/Si.rc b/programs/progman/Si.rc index cf165ae..d918e20 100644 --- a/programs/progman/Si.rc +++ b/programs/progman/Si.rc @@ -225,21 +225,21 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT { IDS_LICENSE_CAPTION, "LICENČNA POGODBA" IDS_LICENSE, -"This library is free software; you can redistribute it and/or \ +"This program 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.\n\ -This library is distributed in the hope that it will be useful, \ +This program 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.\n\ You should have received a copy of the GNU Lesser General Public \ -License along with this library; if not, write to the Free Software \ +License along with this program; if not, write to the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" IDS_WARRANTY_CAPTION, "BREZ GARANCIJE" IDS_WARRANTY, -"This library is distributed in the hope that it will be useful, \ +"This program 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."

1 0

Francois Gouget : winecfg: Winecfg is a program, not a library. So tweak the license and warranty messages accordingly.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: dbd8387cbd56e6c96f6638fd14a5f19a8d3086da URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd8387cbd56e6c96f6638fd1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 17:57:09 2008 +0200 winecfg: Winecfg is a program, not a library. So tweak the license and warranty messages accordingly. --- programs/winecfg/Bg.rc | 2 +- programs/winecfg/Cs.rc | 2 +- programs/winecfg/En.rc | 2 +- programs/winecfg/Es.rc | 2 +- programs/winecfg/Fi.rc | 2 +- programs/winecfg/It.rc | 2 +- programs/winecfg/Ja.rc | 2 +- programs/winecfg/Nl.rc | 2 +- programs/winecfg/Pt.rc | 2 +- programs/winecfg/Ro.rc | 2 +- programs/winecfg/Ru.rc | 2 +- programs/winecfg/Si.rc | 2 +- programs/winecfg/Tr.rc | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbd8387cbd56e6c96f663…

1 0

Francois Gouget : clock: Clock is a program, not a library. So tweak the license and warranty messages accordingly.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 705dc91571212df334a1e90f03f8f3efd36a827d URL: http://source.winehq.org/git/wine.git/?a=commit;h=705dc91571212df334a1e90f0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 17:56:47 2008 +0200 clock: Clock is a program, not a library. So tweak the license and warranty messages accordingly. --- programs/clock/En.rc | 8 ++++---- programs/clock/Es.rc | 8 ++++---- programs/clock/Ko.rc | 8 ++++---- programs/clock/Pl.rc | 8 ++++---- programs/clock/Si.rc | 8 ++++---- programs/clock/Sv.rc | 8 ++++---- programs/clock/Tr.rc | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=705dc91571212df334a1e…

1 0

Alexandre Julliard : winetest: Fix the printf format for the version numbers.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 065dc03faf2df34d6429cd590e6a3e2007f8047c URL: http://source.winehq.org/git/wine.git/?a=commit;h=065dc03faf2df34d6429cd590… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 17:45:24 2008 +0200 winetest: Fix the printf format for the version numbers. --- programs/winetest/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 7d61da5..b56ba79 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -138,8 +138,8 @@ static void print_version (void) xprintf (" bRunningUnderWine=%d\n", running_under_wine ()); xprintf (" bRunningOnVisibleDesktop=%d\n", running_on_visible_desktop ()); - xprintf (" dwMajorVersion=%ld\n dwMinorVersion=%ld\n" - " dwBuildNumber=%ld\n PlatformId=%ld\n szCSDVersion=%s\n", + xprintf (" dwMajorVersion=%u\n dwMinorVersion=%u\n" + " dwBuildNumber=%u\n PlatformId=%u\n szCSDVersion=%s\n", ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, ver.dwPlatformId, ver.szCSDVersion);

1 0

Alexandre Julliard : msvcrt/tests: Fix a couple of tests on Vista.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: d36c55001d1a884f6a1846bcef03853aeab3954d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36c55001d1a884f6a1846bce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 17:45:10 2008 +0200 msvcrt/tests: Fix a couple of tests on Vista. --- dlls/msvcrt/tests/printf.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 2cd08a7..846b844 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -206,8 +206,11 @@ static void test_sprintf( void ) format = "%lld"; r = sprintf(buffer,format,((ULONGLONG)0xffffffff)*0xffffffff); - ok(!strcmp(buffer, "1"), "Problem with \"ll\" interpretation\n"); - ok( r==1, "return count wrong\n"); + ok( r == 1 || r == 11, "return count wrong %d\n", r); + if (r == 11) /* %ll works on Vista */ + ok(!strcmp(buffer, "-8589934591"), "Problem with \"ll\" interpretation '%s'\n", buffer); + else + ok(!strcmp(buffer, "1"), "Problem with \"ll\" interpretation '%s'\n", buffer); format = "%I"; r = sprintf(buffer,format,1); @@ -516,16 +519,6 @@ static void test_swprintf( void ) ok( wcscmp(string_w,buffer) == 0, "swprintf failed with %%hs\n"); } -static void test_fwprintf( void ) -{ - const char *string="not a wide string"; - todo_wine - { - ok(fwprintf(fopen("nul","r+"),(const wchar_t *)string) == -1, - "Non-wide string should not be printed by fwprintf\n"); - } -} - static void test_snprintf (void) { struct snprintf_test { @@ -655,7 +648,6 @@ START_TEST(printf) { test_sprintf(); test_swprintf(); - test_fwprintf(); test_snprintf(); test_fcvt(); }

1 0

Alexandre Julliard : kernel32/tests: Use Local instead of Global prefix to avoid permission issues.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 3cb0bcff832454f7cdda6afba09346c474e80398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb0bcff832454f7cdda6afba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 17:44:57 2008 +0200 kernel32/tests: Use Local instead of Global prefix to avoid permission issues. --- dlls/kernel32/tests/virtual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index fc70a76..3da3bce 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -450,11 +450,11 @@ static void test_MapViewOfFile(void) DeleteFileA( testfile ); SetLastError(0xdeadbeef); - file = CreateFileMapping( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "Global\\Foo"); + file = CreateFileMapping( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "Local\\Foo"); ok( file != 0, "CreateFileMapping PAGE_READWRITE error %u\n", GetLastError() ); SetLastError(0xdeadbeef); - mapping = OpenFileMapping( FILE_MAP_READ, FALSE, "Global\\Foo" ); + mapping = OpenFileMapping( FILE_MAP_READ, FALSE, "Local\\Foo" ); ok( mapping != 0, "OpenFileMapping FILE_MAP_READ error %u\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); @@ -476,7 +476,7 @@ todo_wine ok( info.Protect == PAGE_READONLY, "%x != PAGE_READONLY\n", info.Prote CloseHandle( mapping ); SetLastError(0xdeadbeef); - mapping = OpenFileMapping( FILE_MAP_WRITE, FALSE, "Global\\Foo" ); + mapping = OpenFileMapping( FILE_MAP_WRITE, FALSE, "Local\\Foo" ); ok( mapping != 0, "OpenFileMapping FILE_MAP_WRITE error %u\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 );

1 0

Alexandre Julliard : kernel32/tests: Fix the change notification test on Vista.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: af785c4d0ff8a00ce9ed1f6f8632e61571ac2892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af785c4d0ff8a00ce9ed1f6f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 17:44:41 2008 +0200 kernel32/tests: Fix the change notification test on Vista. --- dlls/kernel32/tests/change.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index c070eb0..cb500ef 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -560,8 +560,8 @@ static void test_readdirectorychanges(void) pfni = (PFILE_NOTIFY_INFORMATION) buffer; ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" ); - ok( pfni->FileNameLength == 0x0c, "len wrong\n" ); - ok( !memcmp(pfni->FileName,&szGa[1],6), "name wrong\n" ); + ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong\n" ); + ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); r = RemoveDirectoryW( subsubdir ); ok( r == TRUE, "failed to remove directory\n"); @@ -578,13 +578,21 @@ static void test_readdirectorychanges(void) ok( r == WAIT_OBJECT_0, "should be ready\n" ); pfni = (PFILE_NOTIFY_INFORMATION) buffer; - ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); - ok( pfni->Action == FILE_ACTION_REMOVED, "action wrong\n" ); - ok( pfni->FileNameLength == 0x0c, "len wrong\n" ); - ok( !memcmp(pfni->FileName,&szGa[1],6), "name wrong\n" ); + /* we may get a notification for the parent dir too */ + if (pfni->Action == FILE_ACTION_MODIFIED && pfni->NextEntryOffset) + { + ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength ); + ok( !memcmp(pfni->FileName,&szGa[1],3*sizeof(WCHAR)), "name wrong\n" ); + pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + } + ok( pfni->NextEntryOffset == 0, "offset wrong %u\n", pfni->NextEntryOffset ); + ok( pfni->Action == FILE_ACTION_REMOVED, "action wrong %u\n", pfni->Action ); + ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength ); + ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n"); + dwCount = (char *)&pfni->FileName[pfni->FileNameLength/sizeof(WCHAR)] - buffer; + ok( ov.InternalHigh == dwCount, "ov.InternalHigh wrong %lu/%u\n",ov.InternalHigh, dwCount ); CloseHandle(hdir);

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2008