February 2015 - Wine-Commits

Matteo Bruni : opengl32: Return a NULL pointer for functions requiring unsupported or disabled extensions.
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Module: wine Branch: master Commit: bfd4836867d6d90eaeae6ccbc02e37678b59b8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd4836867d6d90eaeae6ccbc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:20 2015 +0100 opengl32: Return a NULL pointer for functions requiring unsupported or disabled extensions. --- dlls/opengl32/wgl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 1903807..9482c75 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -875,7 +875,10 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) void *driver_func = funcs->wgl.p_wglGetProcAddress( name ); if (!is_extension_supported(ext_ret->extension)) + { WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); + return NULL; + } if (driver_func == NULL) {

1 0

Henri Verbeet : d3d10core: Implement d3d10_buffer_SetPrivateDataInterface( ).
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Module: wine Branch: master Commit: 3cf80b7fb78e07f2b92df24bf49b16da035e5c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf80b7fb78e07f2b92df24bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:06 2015 +0100 d3d10core: Implement d3d10_buffer_SetPrivateDataInterface(). --- dlls/d3d10core/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index ff94fbc..d261a8d 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -122,9 +122,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&buffer->private_store, guid, data); } /* ID3D10Resource methods */

1 0

Henri Verbeet : d3d10core: Implement d3d10_buffer_GetPrivateData().
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Module: wine Branch: master Commit: e7c892850bf5119ded771ff0e82292105de57dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c892850bf5119ded771ff0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:07 2015 +0100 d3d10core: Implement d3d10_buffer_GetPrivateData(). --- dlls/d3d10core/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index d261a8d..dcf323c 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -102,10 +102,12 @@ static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&buffer->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_input_layout_GetPrivateData().
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Module: wine Branch: master Commit: 7c8f053880ecb2c6ba42ae54520e759d0343d7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8f053880ecb2c6ba42ae545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:10 2015 +0100 d3d10core: Implement d3d10_input_layout_GetPrivateData(). --- dlls/d3d10core/inputlayout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index a559b0b..bb3e4c5 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -165,10 +165,12 @@ static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *if static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&layout->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLayout *iface,

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

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 Feb. 25, 2015

Feb. 25, 2015

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 Feb. 25, 2015

Feb. 25, 2015

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 Feb. 25, 2015

Feb. 25, 2015

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 Feb. 25, 2015

Feb. 25, 2015

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 Feb. 25, 2015

Feb. 25, 2015

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