April 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32/tests: Take into account multi-monitor setups in the clip region tests.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: caf15dd7979b5eb0a446a89116fb4000ac614242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf15dd7979b5eb0a446a8911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 20 12:12:06 2012 +0200 gdi32/tests: Take into account multi-monitor setups in the clip region tests. --- dlls/gdi32/tests/clipping.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index dcdc8d7..04b2785 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -333,7 +333,7 @@ static void test_GetClipRgn(void) /* Try unsetting and then query the clipping region. */ ret = SelectClipRgn(hdc, NULL); - ok(ret == SIMPLEREGION, + ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), "Expected SelectClipRgn to return SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, NULL); @@ -434,7 +434,8 @@ static void test_window_dc_clipping(void) ok(ret == 0, "expected 0, got %d\n", ret); ret = ExtSelectClipRgn(hdc, hrgn_empty, RGN_DIFF); - ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), + "expected SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, hrgn); ok(ret == 1, "expected 1, got %d\n", ret); @@ -446,7 +447,8 @@ static void test_window_dc_clipping(void) rc.left, rc.top, rc.right, rc.bottom); ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); - ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), + "expected SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, hrgn); ok(ret == 0, "expected 0, got %d\n", ret);

1 0

Piotr Caban : msvcr90: Fix byteswap_ulong implementation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: c0140118be99b6965b44b867eec2c21ac2ac667f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0140118be99b6965b44b867e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 20 12:16:38 2012 +0200 msvcr90: Fix byteswap_ulong implementation. --- dlls/msvcr90/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 2caf60d..99ae9ed 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -378,7 +378,7 @@ unsigned short CDECL _byteswap_ushort(unsigned short s) /********************************************************************* * _byteswap_ulong (MSVCR90.@) */ -unsigned long CDECL _byteswap_ulong(unsigned long l) +ULONG CDECL _byteswap_ulong(ULONG l) { return (l<<24) + ((l<<8)&0xFF0000) + ((l>>8)&0xFF00) + (l>>24); }

1 0

Huw Davies : winspool: Update the default settings when deleting the default printer.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 1aa5696c933490d6a02661860466a0acc335cb8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa5696c933490d6a02661860… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 20 11:19:28 2012 +0100 winspool: Update the default settings when deleting the default printer. --- dlls/winspool.drv/info.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a2e3f8b..30dcd86 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2812,6 +2812,8 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) { LPCWSTR lpNameW = get_opened_printer_name(hPrinter); HKEY hkeyPrinters, hkey; + WCHAR def[MAX_PATH]; + DWORD size = sizeof( def ) / sizeof( def[0] ); if(!lpNameW) { SetLastError(ERROR_INVALID_HANDLE); @@ -2833,6 +2835,18 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) RegDeleteValueW(hkey, lpNameW); RegCloseKey(hkey); } + + if (GetDefaultPrinterW( def, &size ) && !strcmpW( def, lpNameW )) + { + WriteProfileStringW( windowsW, deviceW, NULL ); + if (!RegCreateKeyW( HKEY_CURRENT_USER, user_default_reg_key, &hkey )) + { + RegDeleteValueW( hkey, deviceW ); + RegCloseKey( hkey ); + } + SetDefaultPrinterW( NULL ); + } + return TRUE; }

1 0

Huw Davies : winspool: If CUPS is found but lists no printers assume that there really are no printers - don 't look in /etc/printcap.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: f27df046ad97129fc5be8a9c1d66f11938a6d277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27df046ad97129fc5be8a9c1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 20 11:19:29 2012 +0100 winspool: If CUPS is found but lists no printers assume that there really are no printers - don't look in /etc/printcap. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 30dcd86..a09ebbe 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -567,7 +567,7 @@ static BOOL CUPS_LoadPrinters(void) } pcupsFreeDests(nrofdests, dests); RegCloseKey(hkeyPrinters); - return hadprinter; + return TRUE; } #endif

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 1fbccef1accc0a369c3c1704129ac11a15bab7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbccef1accc0a369c3c17041… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 20 11:13:02 2012 +0400 po: Update Russian translation. --- po/ru.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index 339fba0..80c1791 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3538,16 +3538,12 @@ msgid "URI to be decoded is incorrect" msgstr "Декодируемый URI неверен" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Значение перечисления вне диапазона.\n" +msgstr "Количество знаков после запятой вне диапазона" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Индекс вне диапазона" +msgstr "Точность представления вне диапазона" #: jscript.rc:59 msgid "Array length must be a finite positive integer"

1 0

Francois Gouget : po: Fix some typography issues in the Czech translation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 985ae2290c192ea2629c874ad21cd5ba041e9d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=985ae2290c192ea2629c874ad… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:15:47 2012 +0200 po: Fix some typography issues in the Czech translation. --- po/cs.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index d6d3234..f7fa51b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1166,11 +1166,11 @@ msgstr "mm" #: credui.rc:42 msgid "&User name:" -msgstr "&Uživatelské jméno" +msgstr "&Uživatelské jméno:" #: credui.rc:45 cryptui.rc:394 msgid "&Password:" -msgstr "&Heslo" +msgstr "&Heslo:" #: credui.rc:47 msgid "&Remember my password" @@ -12644,7 +12644,7 @@ msgstr "Zobrazit rozšířené možnosti" #: winecfg.rc:240 msgid "De&vice:" -msgstr "&Zařízení" +msgstr "&Zařízení:" #: winecfg.rc:242 msgid "Bro&wse..."

1 0

Francois Gouget : po: A couple of line wrapping tweaks in the Czech translation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 6ff1efb717b4e7a7e3a1ea5743b90d6458428153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff1efb717b4e7a7e3a1ea574… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:16:39 2012 +0200 po: A couple of line wrapping tweaks in the Czech translation. --- po/cs.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index f7fa51b..169618f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -178,8 +178,7 @@ msgid "" "entry for this program from the registry?" msgstr "" "Spuštění odinstalování %s selhalo, možná příčína je předchozí smazání " -"aplikace.\n" -"Přejete si odstranit záznam odinstalace tohoto programu z registru?" +"aplikace. Přejete si odstranit záznam odinstalace tohoto programu z registru?" #: appwiz.rc:33 #, fuzzy @@ -1205,7 +1204,7 @@ msgid "" msgstr "" "Zapnutý Caps Lock může způsobit nesprávné zadání hesla.\n" "\n" -"Stiskněte klávesu Caps Lock na své klávesnici pro vypnutí funkce Caps Lock " +"Stiskněte klávesu Caps Lock na své klávesnici pro vypnutí funkce Caps Lock\n" "před napsáním hesla." #: credui.rc:31

1 0

Francois Gouget : po: Fix a couple of typography issues in the Portuguese ( Portugal) translation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 062f8d0ee7bcd204e6d55f5d19a5822c0f134689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062f8d0ee7bcd204e6d55f5d1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:22:02 2012 +0200 po: Fix a couple of typography issues in the Portuguese (Portugal) translation. --- po/pt_PT.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 8143bf4..efd2cd6 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -12809,9 +12809,9 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"se não tem uma unidade C. Isto não é nada bom.\n" +"Se não tem uma unidade C. Isto não é nada bom.\n" "\n" -"Certifique-se que clica em ?Adicionar? no separador Unidades para criar " +"Certifique-se que clica em 'Adicionar' no separador Unidades para criar " "uma!\n" #: winecfg.rc:90

1 0

Francois Gouget : po: Assorted French translation spelling fixes and tweaks .
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 6b13b3f9fbaf8bd4a4d236c38171dd0f399d7f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b13b3f9fbaf8bd4a4d236c38… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:24:13 2012 +0200 po: Assorted French translation spelling fixes and tweaks. --- po/fr.po | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/po/fr.po b/po/fr.po index a05c559..3e74166 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2092,7 +2092,7 @@ msgstr "Avis de non-responsabilité" #: cryptui.rc:228 msgid "More &Info" -msgstr "&Infos complémentaires" +msgstr "Plus d'&Infos" #: cryptui.rc:236 msgid "&Friendly name:" @@ -6296,7 +6296,7 @@ msgstr "Il n'y a plus de liaisons.\n" #: winerror.mc:3446 msgid "Can't logon with interdomain trust account.\n" -msgstr "Ne peut se connecter avec un compte d'approbation interdomaines.\n" +msgstr "Ne peut se connecter avec un compte d'approbation inter-domaines.\n" #: winerror.mc:3451 msgid "Can't logon with workstation trust account.\n" @@ -6458,7 +6458,7 @@ msgstr "Pilote invalide.\n" #: winerror.mc:3646 msgid "Invalid object resolver set.\n" -msgstr "Jeu de solveurs d'objets invalide.\n" +msgstr "Jeu de résolveurs d'objets invalide.\n" #: winerror.mc:3651 msgid "Incomplete RPC send.\n" @@ -8293,7 +8293,7 @@ msgstr "&Taille du papier :" #: wineps.rc:36 msgid "Duplex:" -msgstr "Recto-verso :" +msgstr "Recto verso :" #: wininet.rc:39 wininet.rc:59 msgid "Realm" @@ -10693,7 +10693,7 @@ msgstr "" #: oleview.rc:178 msgid "Default Interface Viewer" -msgstr "Visionneur d'interface par défaut" +msgstr "Visionneuse d'interface par défaut" #: oleview.rc:181 msgid "Interface" @@ -10709,7 +10709,7 @@ msgstr "&Afficher les informations de type" #: oleview.rc:191 msgid "IPersist Interface Viewer" -msgstr "Visionneur d'interface IPersist" +msgstr "Visionneuse d'interface IPersist" #: oleview.rc:194 oleview.rc:206 msgid "Class Name:" @@ -10721,7 +10721,7 @@ msgstr "CLSID :" #: oleview.rc:203 msgid "IPersistStream Interface Viewer" -msgstr "Visionneur d'interface IPersistStream" +msgstr "Visionneuse d'interface IPersistStream" #: oleview.rc:93 oleview.rc:94 msgid "OleView" @@ -11983,7 +11983,7 @@ msgstr "Nom de l'&image" #: taskmgr.rc:523 msgid "&PID (Process Identifier)" -msgstr "&PID (ident. de processus)" +msgstr "&PID (Identifiant de processus)" #: taskmgr.rc:525 msgid "&CPU Usage" @@ -12023,7 +12023,7 @@ msgstr "Octets de lecture E/S" #: taskmgr.rc:543 msgid "&Session ID" -msgstr "Identi&ficateur de session" +msgstr "Identi&fiant de session" #: taskmgr.rc:545 msgid "User &Name" @@ -12848,7 +12848,7 @@ msgstr "Sélectionnez un fichier exécutable" #: winecfg.rc:66 msgid "Autodetect" -msgstr "Autodétection" +msgstr "Auto-détection" #: winecfg.rc:67 msgid "Local hard disk" @@ -13748,7 +13748,7 @@ msgstr "&Rétablir\tCtrl+Y" #: wordpad.rc:47 msgid "&Clear\tDel" -msgstr "&Effacer\tDel" +msgstr "&Effacer\tSuppr" #: wordpad.rc:48 msgid "&Select all\tCtrl+A"

1 0

Francois Gouget : po: Mark an Esperanto translation with an invalid formatting directive as fuzzy .
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: dcb5742e2558f02b6a287dd52863e9be88fc8fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb5742e2558f02b6a287dd52… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:25:14 2012 +0200 po: Mark an Esperanto translation with an invalid formatting directive as fuzzy. --- po/eo.po | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/po/eo.po b/po/eo.po index b207d0f..8aa443f 100644 --- a/po/eo.po +++ b/po/eo.po @@ -5808,7 +5808,9 @@ msgstr "Finpunkto ne estis trovita.\n" msgid "Invalid timeout value.\n" msgstr "" +# FIXME: Invalid formatting directive #: winerror.mc:2981 +#, fuzzy msgid "Object UUID not found.\n" msgstr "Mi ne trovis la objektan UUID-on %s.\n"

1 0