February 2015 - Wine-commits

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 0200ee838d7e78953a7cfad5fe57e1f705555c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0200ee838d7e78953a7cfad5f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 25 11:46:33 2015 +0200 po: Update Ukrainian translation. --- po/uk.po | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/po/uk.po b/po/uk.po index 37d9a08..dd47944 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2730,11 +2730,6 @@ msgstr "" "Ви дійсно хочете видалити цей сертифікат?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -3146,8 +3141,6 @@ msgid "&View Source" msgstr "&Переглянути вихідний код" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" msgstr "Властивості" @@ -11601,10 +11594,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Помилка: неправильні параметри командного рядка\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Помилка: неможливо додати ключі на віддаленій машині\n" +msgstr "Помилка: неможливо отримати доступ до віддаленої машини\n" #: reg.rc:38 msgid "" @@ -11612,10 +11603,8 @@ msgid "" msgstr "Помилка: не вдалось знайти вказаний ключ реєстру чи значення\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Помилка: Непідтримуваний тип\n" #: regedit.rc:34 msgid "&Registry"

1 0

Jacek Caban : mshtml: Correctly handle S_OK with NULL URL return from TranslateUrl.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 203c47e60470812dce2d619bb856a61d9cc2a535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203c47e60470812dce2d619bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 25 12:59:20 2015 +0100 mshtml: Correctly handle S_OK with NULL URL return from TranslateUrl. --- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/tests/htmldoc.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c2d4603..39e2733 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2324,7 +2324,7 @@ static HRESULT translate_uri(HTMLOuterWindow *window, IUri *orig_uri, BSTR *ret_ hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, display_uri, &translated_url); - if(hres == S_OK) { + if(hres == S_OK && translated_url) { TRACE("%08x %s -> %s\n", hres, debugstr_w(display_uri), debugstr_w(translated_url)); SysFreeString(display_uri); hres = create_uri(translated_url, 0, &uri); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 3b332d1..33f4696 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2614,6 +2614,12 @@ static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, D ok(ppchURLOut != NULL, "ppchURLOut == NULL\n"); ok(!*ppchURLOut, "*ppchURLOut = %p\n", *ppchURLOut); + /* Not related to hash navigation, just return NULL and S_OK in some cases. */ + if(loading_hash) { + *ppchURLOut = NULL; + return S_OK; + } + return S_FALSE; }

1 0

Jacek Caban : mshtml: Wine Gecko 2.36 release.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 20080c616de9d410f33cc2bbafc329b42d49fc05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20080c616de9d410f33cc2bba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 24 14:19:41 2015 +0100 mshtml: Wine Gecko 2.36 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/nsiface.idl | 139 +++++++++++++++++++++-------------------------- dlls/mshtml/nsio.c | 89 +++++++++++++++++++++++++++++- 3 files changed, 152 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20080c616de9d410f33cc…

1 0

Piotr Caban : msvcp: Added _Getdateorder implementation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: b0f8a2b85f1ef8989d77b66e54433009fab53847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f8a2b85f1ef8989d77b66e5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 25 15:33:52 2015 +0100 msvcp: Added _Getdateorder implementation. --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 26 ++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.spec | 2 +- 7 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 0055d79..bafbf18 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2912,7 +2912,7 @@ @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -ret64 _Getcvt() -@ stub _Getdateorder +@ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a2c5ac9..6548146 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3781,7 +3781,7 @@ @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -ret64 _Getcvt() -@ stub _Getdateorder +@ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 653b742..30071ab 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3724,7 +3724,7 @@ @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -ret64 _Getcvt() -@ stub _Getdateorder +@ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 390d470..61ba791 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3724,7 +3724,7 @@ @ cdecl -ret64 _Getcoll() msvcp120._Getcoll @ cdecl _Getctype(ptr) msvcp120._Getctype @ cdecl -ret64 _Getcvt() msvcp120._Getcvt -@ stub _Getdateorder +@ cdecl _Getdateorder() msvcp120._Getdateorder @ cdecl _Getwctype(long ptr) msvcp120._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp120._Getwctypes @ extern _Hugeval msvcp120._Hugeval diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 8f3c43e..ed18b59 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5727,7 +5727,7 @@ @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -ret64 _Getcvt() -@ stub _Getdateorder +@ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a0fbc66..95f4e8d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -38,6 +38,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +typedef enum { + DATEORDER_no_order, + DATEORDER_dmy, + DATEORDER_mdy, + DATEORDER_ymd, + DATEORDER_ydm +} dateorder; + char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); @@ -689,13 +697,27 @@ _Cvtvec* __thiscall _Locinfo__Getcvt(const _Locinfo *this, _Cvtvec *ret) return ret; } +int __cdecl _Getdateorder(void) +{ + WCHAR date_fmt[2]; + + if(!GetLocaleInfoW(___lc_handle_func()[LC_TIME], LOCALE_ILDATE, + date_fmt, sizeof(date_fmt)/sizeof(*date_fmt))) + return DATEORDER_no_order; + + if(*date_fmt == '0') return DATEORDER_mdy; + if(*date_fmt == '1') return DATEORDER_dmy; + if(*date_fmt == '2') return DATEORDER_ymd; + return DATEORDER_no_order; +} + /* ?_Getdateorder(a)_Locinfo@std@@QBEHXZ */ /* ?_Getdateorder(a)_Locinfo@std@@QEBAHXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getdateorder, 4) int __thiscall _Locinfo__Getdateorder(const _Locinfo *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return _Getdateorder(); } /* ?_Getdays(a)_Locinfo@std@@QBEPBDXZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 925a153..0e5c842 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6499,7 +6499,7 @@ @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -ret64 _Getcvt() -@ stub _Getdateorder +@ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: ab21c7ca77f319640dff27cf2eb9bf5bb7b92b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab21c7ca77f319640dff27cf2… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Feb 24 14:55:33 2015 +0100 po: Update German translation. --- po/de.po | 79 +++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/po/de.po b/po/de.po index f99a105..c5ae822 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-05 22:22+0100\n" +"PO-Revision-Date: 2015-02-24 14:54+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -4526,31 +4526,31 @@ msgstr "Ungültiger Schlüssel.\n" #: winerror.mc:1071 msgid "Can't open registry key.\n" -msgstr "Kann Registry-Schlüssel nicht öffnen.\n" +msgstr "Registrierungsschlüssel konnte nicht geöffnet werden.\n" #: winerror.mc:1076 msgid "Can't read registry key.\n" -msgstr "Kann Registry-Schlüssel nicht lesen.\n" +msgstr "Registrierungsschlüssel konnte nicht gelesen werden.\n" #: winerror.mc:1081 msgid "Can't write registry key.\n" -msgstr "Kann Registry-Schlüssel nicht schreiben.\n" +msgstr "Registrierungsschlüssel konnte nicht geschrieben werden.\n" #: winerror.mc:1086 msgid "Registry has been recovered.\n" -msgstr "Registry wurde wiederhergestellt.\n" +msgstr "Registrierung wurde wiederhergestellt.\n" #: winerror.mc:1091 msgid "Registry is corrupt.\n" -msgstr "Registry ist beschädigt.\n" +msgstr "Registrierung ist beschädigt.\n" #: winerror.mc:1096 msgid "I/O to registry failed.\n" -msgstr "E/A zu Registry fehlgeschlagen.\n" +msgstr "E/A zur Registrierung fehlgeschlagen.\n" #: winerror.mc:1101 msgid "Not registry file.\n" -msgstr "Keine Registry-Datei.\n" +msgstr "Keine Registrierungsdatei.\n" #: winerror.mc:1106 msgid "Key deleted.\n" @@ -4558,11 +4558,11 @@ msgstr "Schlüssel gelöscht.\n" #: winerror.mc:1111 msgid "No registry log space.\n" -msgstr "Kein Speicher für Registry-Protokoll.\n" +msgstr "Kein Speicher für Registrierungs-Log.\n" #: winerror.mc:1116 msgid "Registry key has subkeys.\n" -msgstr "Registry-Schlüssel hat Unterschlüssel.\n" +msgstr "Registrierungsschlüssel hat Unterschlüssel.\n" #: winerror.mc:1121 msgid "Subkey must be volatile.\n" @@ -4606,7 +4606,7 @@ msgstr "Dienst ist deaktiviert.\n" #: winerror.mc:1171 msgid "Circular dependency.\n" -msgstr "Zirkulare Abhängigkeit.\n" +msgstr "Zirkuläre Abhängigkeit.\n" #: winerror.mc:1176 msgid "Service does not exist.\n" @@ -4634,7 +4634,7 @@ msgstr "Datenbank existiert nicht.\n" #: winerror.mc:1206 msgid "Service-specific error.\n" -msgstr "Dienst-spezifischer Fehler.\n" +msgstr "Dienstspezifischer Fehler.\n" #: winerror.mc:1211 msgid "Process aborted.\n" @@ -11001,7 +11001,7 @@ msgstr "&Systemkonfiguration" #: oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "&Registry-Editor ausführen" +msgstr "&Registrierungs-Editor ausführen" #: oleview.rc:40 msgid "&Object" @@ -11112,7 +11112,7 @@ msgid "" "These settings change only registry values.\n" "They have no effect on Wine performance." msgstr "" -"Diese Einstellungen ändern nur Registry-Werte.\n" +"Diese Einstellungen ändern nur Registrierungswerte.\n" "Sie haben keinen Einfluss auf die Wine-Performance." #: oleview.rc:181 @@ -11181,7 +11181,7 @@ msgstr "Maschinenweite Distributed COM Einstellungen ändern" #: oleview.rc:109 msgid "Run the Wine registry editor" -msgstr "Wine-Registry-Editor ausführen" +msgstr "Wine-Registrierungs-Editor ausführen" #: oleview.rc:110 msgid "Quit the application. Prompts to save changes" @@ -11584,10 +11584,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Fehler: Ungültige Befehlszeilenargumente\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Fehler: Konnte Schlüssel nicht zum Remoterechner hinzufügen\n" +msgstr "Fehler: Auf den Remoterechner kann nicht zugegriffen werden\n" #: reg.rc:38 msgid "" @@ -11596,22 +11594,20 @@ msgstr "" "Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Nicht unterstützter Typ.\n" +msgstr "Fehler: Nicht unterstützter Typ\n" #: regedit.rc:34 msgid "&Registry" -msgstr "&Registry" +msgstr "&Registrierung" #: regedit.rc:36 msgid "&Import Registry File..." -msgstr "Registry &importieren..." +msgstr "Registrierungsdatei &importieren..." #: regedit.rc:37 msgid "&Export Registry File..." -msgstr "Registry &exportieren..." +msgstr "Registrierungsdatei &exportieren..." #: regedit.rc:49 regedit.rc:100 msgid "&Key" @@ -11667,7 +11663,7 @@ msgstr "Von den Favoriten &löschen..." #: regedit.rc:82 msgid "&About Registry Editor" -msgstr "&Über Registry Editor" +msgstr "&Über den Registrierungs-Editor" #: regedit.rc:91 msgid "Modify Binary Data..." @@ -11675,7 +11671,7 @@ msgstr "Binäre Daten ändern..." #: regedit.rc:218 msgid "Export registry" -msgstr "Registry &exportieren" +msgstr "Registrierung &exportieren" #: regedit.rc:220 msgid "S&elected branch:" @@ -11711,7 +11707,7 @@ msgstr "Zu den Favoriten hinzufügen" #: regedit.rc:245 regedit.rc:256 msgid "Name:" -msgstr "NAME:" +msgstr "Name:" #: regedit.rc:253 msgid "Remove Favorite" @@ -11719,7 +11715,7 @@ msgstr "Von den Favoriten entfernen" #: regedit.rc:264 msgid "Edit String" -msgstr "Zeichenfolge ändern" +msgstr "Zeichenfolge editieren" #: regedit.rc:267 regedit.rc:280 regedit.rc:296 regedit.rc:309 msgid "Value name:" @@ -11755,7 +11751,7 @@ msgstr "Mehrteilige Zeichenfolge editieren" #: regedit.rc:137 msgid "Contains commands for working with the whole registry" -msgstr "Befehle zum Bearbeiten der ganzen Registry" +msgstr "Befehle zum Bearbeiten der ganzen Registrierung" #: regedit.rc:138 msgid "Contains commands for editing values or keys" @@ -11772,7 +11768,8 @@ msgstr "Befehle zum Zugriff auf häufig benutzte Schlüssel" #: regedit.rc:141 msgid "" "Contains commands for displaying help and information about registry editor" -msgstr "Befehle zum Anzeigen der Hilfe oder Informationen über das Programm" +msgstr "" +"Befehle zum Anzeigen der Hilfe oder von Informationen über das Programm" #: regedit.rc:142 msgid "Contains commands for creating new keys or values" @@ -11784,23 +11781,23 @@ msgstr "Daten" #: regedit.rc:132 msgid "Registry Editor" -msgstr "Registry-Editor" +msgstr "Registrierungs-Editor" #: regedit.rc:194 msgid "Import Registry File" -msgstr "Registry-Datei importieren" +msgstr "Registrierungsdatei importieren" #: regedit.rc:195 msgid "Export Registry File" -msgstr "Registry-Datei exportieren" +msgstr "Registrierungsdatei exportieren" #: regedit.rc:196 msgid "Registry files (*.reg)" -msgstr "Registry-Dateien (*.reg)" +msgstr "Registrierungsdateien (*.reg)" #: regedit.rc:197 msgid "Win9x/NT4 Registry files (REGEDIT4)" -msgstr "Win9x/NT4 Registry-Dateien (REGEDIT4)" +msgstr "Win9x/NT4 Registrierungsdateien (REGEDIT4)" #: regedit.rc:204 msgid "(Default)" @@ -11820,7 +11817,7 @@ msgstr "(unbekannt %d)" #: regedit.rc:163 msgid "Quits the registry editor" -msgstr "Beendet den Registry-Editor" +msgstr "Beendet den Registrierungs-Editor" #: regedit.rc:164 msgid "Adds keys to the favorites list" @@ -13207,11 +13204,11 @@ msgstr "Darstellung" #: winecfg.rc:287 msgid "&Theme:" -msgstr "&Motiv:" +msgstr "&Thema:" #: winecfg.rc:289 msgid "&Install theme..." -msgstr "Motiv &installieren..." +msgstr "Thema &installieren..." #: winecfg.rc:294 msgid "It&em:" @@ -13247,7 +13244,7 @@ msgstr "&Erweitert ausblenden" #: winecfg.rc:39 msgid "(No Theme)" -msgstr "(Kein Motiv)" +msgstr "(Kein Thema)" #: winecfg.rc:40 msgid "Graphics" @@ -13271,11 +13268,11 @@ msgstr "Wine-Konfiguration" #: winecfg.rc:46 msgid "Theme files (*.msstyles; *.theme)" -msgstr "Motiv-Dateien (*.msstyles; *.theme)" +msgstr "Themen-Dateien (*.msstyles; *.theme)" #: winecfg.rc:47 msgid "Select a theme file" -msgstr "Motiv-Datei auswählen" +msgstr "Themen-Datei auswählen" #: winecfg.rc:48 msgid "Folder"

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 8a3faa98b2419670e6a93343cd0baf5a68aef604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3faa98b2419670e6a93343c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 25 01:38:49 2015 +0900 po: Update Japanese translation. --- po/ja.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/ja.po b/po/ja.po index 597fcbd..9f41977 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-05 00:17+0900\n" +"PO-Revision-Date: 2015-02-25 00:13+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" @@ -11476,7 +11476,7 @@ msgid "" "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" "f]\n" msgstr "" -"REG ADD キー名 [/v 値名 | /ve] [/t type] [/s セパレータ] [/d データ] [/f]\n" +"REG ADD キー名 [/v 値名 | /ve] [/t 種類] [/s セパレータ] [/d データ] [/f]\n" #: reg.rc:32 msgid "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" @@ -11499,10 +11499,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "エラー: コマンドライン引数が無効です\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "エラー: リモートマシンにキーを追加できませんでした\n" +msgstr "エラー: リモートマシンにアクセスできませんでした\n" #: reg.rc:38 msgid "" @@ -11510,10 +11508,8 @@ msgid "" msgstr "エラー: システムは指定されたキーまたは値を見つけられませんでした\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "サポートされていない種類です。\n" +msgstr "エラー: サポートされていない種類です\n" #: regedit.rc:34 msgid "&Registry"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: ea01855049faaf09096a72914886a9ef4ee82912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea01855049faaf09096a72914… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Feb 24 19:25:00 2015 +0200 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 87c8616..baa1bc9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-23 22:54+0300\n" +"PO-Revision-Date: 2015-02-24 19:18+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3142,10 +3142,8 @@ msgid "&View Source" msgstr "Pirminis &tekstas" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Savybės" +msgstr "Savy&bės" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104

1 0

Akihiro Sagawa : winmm/tests: Add tests for PlaySound().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: e808fb196253b5d326af45c95f8ef5a5ef9c2483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e808fb196253b5d326af45c95… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 25 01:38:46 2015 +0900 winmm/tests: Add tests for PlaySound(). --- dlls/winmm/tests/wave.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 4dcc577..2ffbe17 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1599,10 +1599,98 @@ static void test_fragmentsize(void) CloseHandle(hevent); } +static void create_wav_file(char *temp_file) +{ + WAVEFORMATEX format; + HMMIO h; + MMCKINFO riff_chunk, chunk; + MMRESULT rc; + LONG written; + DWORD length; + char *buffer; + + format.wFormatTag=WAVE_FORMAT_PCM; + format.cbSize = 0; + format.nChannels=1; + format.wBitsPerSample=8; + format.nSamplesPerSec=8000; + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + + h = mmioOpenA(temp_file, NULL, MMIO_ALLOCBUF | MMIO_WRITE | MMIO_CREATE); + ok(h != NULL, "Can't open temp_file\n"); + + riff_chunk.fccType = mmioFOURCC('W','A','V','E'); + rc = mmioCreateChunk(h, &riff_chunk, MMIO_CREATERIFF); + ok(rc == MMSYSERR_NOERROR, "mmioCreateChunk failed, got %u\n", rc); + + chunk.ckid = mmioFOURCC('f','m','t',' '); + rc = mmioCreateChunk(h, &chunk, 0); + ok(rc == MMSYSERR_NOERROR, "mmioCreateChunk failed, got %u\n", rc); + written = mmioWrite(h, (char*)&format, sizeof(format)); + ok(written == sizeof(format), "mmioWrite failed, got %d\n", written); + rc = mmioAscend(h, &chunk, 0); + ok(rc == MMSYSERR_NOERROR, "mmioAscend failed, got %d\n", rc); + + chunk.ckid = mmioFOURCC('d','a','t','a'); + rc = mmioCreateChunk(h, &chunk, 0); + ok(rc == MMSYSERR_NOERROR, "mmioCreateChunk failed, got %u\n", rc); + buffer = wave_generate_silence(&format, .1, &length); + written = mmioWrite(h, buffer, length); + ok(written == length, "mmioWrite failed, got %d\n", written); + rc = mmioAscend(h, &chunk, 0); + ok(rc == MMSYSERR_NOERROR, "mmioAscend failed, got %d\n", rc); + HeapFree(GetProcessHeap(), 0, buffer); + + rc = mmioAscend(h, &riff_chunk, 0); + ok(rc == MMSYSERR_NOERROR, "mmioAscend failed, got %d\n", rc); + + rc = mmioClose(h, 0); + ok(rc == MMSYSERR_NOERROR, "mmioClose failed, got %u\n", rc); +} + +static void test_PlaySound(void) +{ + BOOL br; + char test_file[MAX_PATH], temp[MAX_PATH], *exts; + + if(waveOutGetNumDevs() == 0) { + skip("No output devices available\n"); + return; + } + + GetTempPathA(sizeof(test_file), test_file); + strcat(test_file, "mysound.wav"); + create_wav_file(test_file); + + br = PlaySoundA(test_file, NULL, SND_FILENAME | SND_NODEFAULT); + ok(br, "PlaySound failed, got %d\n", br); + + /* SND_ALIAS fallbacks to SND_FILENAME */ + br = PlaySoundA(test_file, NULL, SND_ALIAS | SND_NODEFAULT); + ok(br, "PlaySound failed, got %d\n", br); + + strcpy(temp, test_file); + exts = strrchr(temp, '.'); + + /* no extensions */ + *exts = '\0'; + br = PlaySoundA(temp, NULL, SND_FILENAME | SND_NODEFAULT); + todo_wine ok(br, "PlaySound failed, got %d\n", br); + + /* ends with a dot */ + strcpy(exts, "."); + br = PlaySoundA(temp, NULL, SND_FILENAME | SND_NODEFAULT); + ok(!br || broken(br), "PlaySound succeeded, got %d\n", br); + + DeleteFileA(test_file); +} + START_TEST(wave) { test_multiple_waveopens(); wave_out_tests(); test_sndPlaySound(); test_fragmentsize(); + test_PlaySound(); }

1 0

Akihiro Sagawa : winmm: Add .wav extension when searching for PlaySound.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 563a4ff08ba9137dda4803a83d8937b3037fa25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=563a4ff08ba9137dda4803a83… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 25 01:38:47 2015 +0900 winmm: Add .wav extension when searching for PlaySound. --- dlls/winmm/playsound.c | 3 ++- dlls/winmm/tests/wave.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index f8bd91f..88a4c48 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -55,11 +55,12 @@ static HMMIO get_mmioFromFile(LPCWSTR lpszName) HMMIO ret; WCHAR buf[256]; LPWSTR dummy; + static const WCHAR dotwav[] = {'.','w','a','v',0}; ret = mmioOpenW((LPWSTR)lpszName, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); if (ret != 0) return ret; - if (SearchPathW(NULL, lpszName, NULL, sizeof(buf)/sizeof(buf[0]), buf, &dummy)) + if (SearchPathW(NULL, lpszName, dotwav, sizeof(buf)/sizeof(buf[0]), buf, &dummy)) { return mmioOpenW(buf, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2ffbe17..e0232e7 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1676,7 +1676,7 @@ static void test_PlaySound(void) /* no extensions */ *exts = '\0'; br = PlaySoundA(temp, NULL, SND_FILENAME | SND_NODEFAULT); - todo_wine ok(br, "PlaySound failed, got %d\n", br); + ok(br, "PlaySound failed, got %d\n", br); /* ends with a dot */ strcpy(exts, ".");

1 0

Frédéric Delanoy : French translation for release 1.7.37
by Jeremy Newman 25 Feb '15

25 Feb '15

Module: website Branch: master Commit: 2d203a307921b6a1a772f45d5a7e2a3df57a08c7 URL: http://source.winehq.org/git/website.git/?a=commit;h=2d203a307921b6a1a772f4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 25 15:28:39 2015 +0100 French translation for release 1.7.37 --- news/fr/2015022001.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015022001.xml b/news/fr/2015022001.xml new file mode 100644 index 0000000..01130b1 --- /dev/null +++ b/news/fr/2015022001.xml @@ -0,0 +1,15 @@ +<news> +<date>20 février 2015</date> +<title>Sortie de Wine 1.7.37</title> +<body> + La version de développement 1.7.37 de Wine est disponible. + <a href="{$root}/announce/1.7.37">Nouveautés</a> de cette version : +<ul> + <li>Notifications de changement d'interface.</li> + <li>Prise en charge du codage UTF-7.</li> + <li>Plusieurs correctifs graphiques pour les contrôles utilisant un thème.</li> + <li>Wininet à présent implémenté au dessus des sockets Win32.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.37.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0