January 2012 - Wine-Commits

Rico Schüller : d3dx9/tests: Add invalid parameter test for ID3DXEffect.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 49ebbd023058ad5e502fc6d8872bc24cbe4643c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ebbd023058ad5e502fc6d88… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jan 27 10:31:49 2012 +0100 d3dx9/tests: Add invalid parameter test for ID3DXEffect. --- dlls/d3dx9_36/tests/effect.c | 156 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49ebbd023058ad5e502fc…

1 0

Jacek Caban : wscript: Properly handle CreateProcess failure.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 9f7da94a3d02a82ff61e0c134f428857ebaa467f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f7da94a3d02a82ff61e0c134… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 11:43:02 2012 +0100 wscript: Properly handle CreateProcess failure. --- programs/wscript/tests/run.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 163be22..315f51f 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -34,8 +34,8 @@ #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE #define CHECK_EXPECT2(func) \ do { \ @@ -355,7 +355,7 @@ static void run_test(const char *file_name) bres = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); if(!bres) { win_skip("script.exe is not available\n"); - SET_CALLED(reportSuccess); + CLEAR_CALLED(reportSuccess); return; }

1 0

Nikolay Sivov : msxml3: Stub lexical handler support for MXWriter.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 32c96e6329e1a35fd8505edaacfff74238601ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c96e6329e1a35fd8505edaa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 14:45:21 2012 +0300 msxml3: Stub lexical handler support for MXWriter. --- dlls/msxml3/mxwriter.c | 159 +++++++++++++++++++++++++++++++++-------- dlls/msxml3/tests/saxreader.c | 21 +++++- 2 files changed, 146 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32c96e6329e1a35fd8505…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 3a18f54f848585d53e25ebd89fc37d46106adb48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a18f54f848585d53e25ebd89… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 26 22:31:17 2012 +0100 po: Update French translation. --- po/fr.po | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6d310a0..1ccb4ca 100644 --- a/po/fr.po +++ b/po/fr.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: 2012-01-24 00:53+0100\n" +"PO-Revision-Date: 2012-01-26 22:30+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -7199,8 +7199,8 @@ msgid "" "your document." msgstr "" "Insère le contenu du presse-papiers dans votre document comme %s. Les " -"données sont liées au fichier source afin que les modifications de celui-" -"ci soient répercutées dans votre document." +"données sont liées au fichier source afin que les modifications de celui-ci " +"soient répercutées dans votre document." #: oledlg.rc:38 msgid "" @@ -10014,9 +10014,8 @@ msgstr "" "\n" #: cmd.rc:318 -#, fuzzy msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "Étiquette du volume (11 caractères, ENTRÉE pour aucun) ?" +msgstr "Étiquette du volume (11 caractères, <Entrée> pour aucun) ?" #: cmd.rc:319 msgid "PATH not found\n" @@ -14190,9 +14189,8 @@ msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Paramètre « %1 » invalide - Utilisez xcopy /? pour obtenir de l'aide\n" #: xcopy.rc:29 -#, fuzzy msgid "Press <Enter> to begin copying\n" -msgstr "Appuyez sur ENTRÉE pour démarrer la copie\n" +msgstr "Appuyez sur <Entrée> pour démarrer la copie\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n"

1 0

Alexandre Julliard : fonts: Add some missing glyphs in the System font.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 5d2b9eb9d3e15c3787571000e6a75673a42a0c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d2b9eb9d3e15c3787571000e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 18:26:11 2012 +0100 fonts: Add some missing glyphs in the System font. --- fonts/system.sfd | 611 +++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/system.ttf | Bin 24820 -> 27496 bytes 2 files changed, 604 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d2b9eb9d3e15c3787571…

1 0

Jörg Höhle : winealsa: Log the periodic renderer callback.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 52c88ea725b4f5e8103bf9b47b2b3b1fe6e22ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c88ea725b4f5e8103bf9b47… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 1 23:59:39 2012 +0100 winealsa: Log the periodic renderer callback. --- dlls/winealsa.drv/mmdevdrv.c | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5da8ec9..fedd040 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1173,14 +1173,13 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, return AUDCLNT_E_NOT_INITIALIZED; } + /* padding is solely updated at callback time in shared mode */ *out = This->held_frames; - /* call required to get accurate snd_pcm_state() */ - snd_pcm_avail_update(This->pcm_handle); - TRACE("pad: %u, state: %u\n", *out, snd_pcm_state(This->pcm_handle)); - LeaveCriticalSection(&This->lock); + TRACE("pad: %u\n", *out); + return S_OK; } @@ -1522,7 +1521,7 @@ static void alsa_write_data(ACImpl *This) if(snd_pcm_state(This->pcm_handle) == SND_PCM_STATE_XRUN || avail > This->alsa_bufsize_frames){ - TRACE("XRun state, recovering\n"); + TRACE("XRun state avail %ld, recovering\n", avail); avail = This->alsa_bufsize_frames; @@ -1534,7 +1533,8 @@ static void alsa_write_data(ACImpl *This) if((err = snd_pcm_prepare(This->pcm_handle)) < 0) WARN("snd_pcm_prepare failed: %d (%s)\n", err, snd_strerror(err)); - } + }else + TRACE("pad: %ld\n", This->alsa_bufsize_frames - avail); if(This->held_frames == 0) return; @@ -1953,8 +1953,6 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, { ACImpl *This = impl_from_IAudioRenderClient(iface); UINT32 write_pos; - UINT32 pad; - HRESULT hr; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1974,13 +1972,8 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return S_OK; } - hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); - if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); - return hr; - } - - if(pad + frames > This->bufsize_frames){ + /* held_frames == GetCurrentPadding_nolock(); */ + if(This->held_frames + frames > This->bufsize_frames){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_TOO_LARGE; }

1 0

Jörg Höhle : winealsa: Map ALSA errors to AUDCLNT_E_*.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: ef111ce1389c542a5f0b7eaa456aeecbc17dba8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef111ce1389c542a5f0b7eaa4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Jan 9 19:04:42 2012 +0100 winealsa: Map ALSA errors to AUDCLNT_E_*. --- dlls/winealsa.drv/mmdevdrv.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index af94add..5da8ec9 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -579,7 +579,12 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, if(err < 0){ HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", key, err, snd_strerror(err)); - return E_FAIL; + switch(err){ + case EBUSY: + return AUDCLNT_E_DEVICE_IN_USE; + default: + return AUDCLNT_E_ENDPOINT_CREATE_FAILED; + } } This->hw_params = HeapAlloc(GetProcessHeap(), 0, @@ -1241,7 +1246,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, EnterCriticalSection(&This->lock); if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1267,13 +1272,13 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, } if((err = snd_pcm_hw_params_get_rate_min(This->hw_params, &min, NULL)) < 0){ - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get min rate: %d (%s)\n", err, snd_strerror(err)); goto exit; } if((err = snd_pcm_hw_params_get_rate_max(This->hw_params, &max, NULL)) < 0){ - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get max rate: %d (%s)\n", err, snd_strerror(err)); goto exit; } @@ -1284,13 +1289,13 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, } if((err = snd_pcm_hw_params_get_channels_min(This->hw_params, &min)) < 0){ - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get min channels: %d (%s)\n", err, snd_strerror(err)); goto exit; } if((err = snd_pcm_hw_params_get_channels_max(This->hw_params, &max)) < 0){ - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); goto exit; } @@ -1365,7 +1370,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1389,14 +1394,14 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; }else{ ERR("Didn't recognize any available ALSA formats\n"); - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } if((err = snd_pcm_hw_params_get_channels_max(This->hw_params, &max_channels)) < 0){ WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1410,7 +1415,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if((err = snd_pcm_hw_params_get_rate_max(This->hw_params, &max_rate, NULL)) < 0){ WARN("Unable to get max rate: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1426,7 +1431,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Format.nSamplesPerSec = 8000; else{ ERR("Unknown max rate: %u\n", max_rate); - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1681,7 +1686,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) This, 0, This->mmdev_period_rt / 10000, WT_EXECUTEINTIMERTHREAD)){ LeaveCriticalSection(&This->lock); WARN("Unable to create timer: %u\n", GetLastError()); - return E_FAIL; + return E_OUTOFMEMORY; } This->started = TRUE;

1 0

Frédéric Delanoy : wininet: Avoid dead code in FTP_FtpOpenFileW (Coverity).
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 39d378538d8e24f4bd5d75e3752da7ee78731caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d378538d8e24f4bd5d75e37… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 25 23:52:02 2012 +0100 wininet: Avoid dead code in FTP_FtpOpenFileW (Coverity). --- dlls/wininet/ftp.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 74316b9..dc5bc12 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1425,11 +1425,8 @@ static HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, } } - if(!bSuccess) { - if(lpwh) - WININET_Release( &lpwh->hdr ); + if(!bSuccess) return FALSE; - } return lpwh->hdr.hInternet; }

1 0

Alexandre Julliard : fonts: Add some missing glyphs in the Small Fonts font .
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 3e6199904f4fc2bf1612f210e07e18435a46a38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6199904f4fc2bf1612f210e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 22:14:54 2012 +0100 fonts: Add some missing glyphs in the Small Fonts font. --- fonts/small_fonts.sfd | 735 +++++++++++++++++++++++++++++++++++++++++++++- fonts/small_fonts.ttf | Bin 15956 -> 18324 bytes fonts/small_fonts_jp.sfd | 327 +++++++++++++++++++-- fonts/small_fonts_jp.ttf | Bin 9116 -> 9908 bytes 4 files changed, 1039 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e6199904f4fc2bf1612f…

1 0

Alexandre Julliard : fonts: Add some missing glyphs in the MS Sans Serif font.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 4b71072b861cc396c4c50806db034f98869e2cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b71072b861cc396c4c50806d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 23:25:00 2012 +0100 fonts: Add some missing glyphs in the MS Sans Serif font. --- fonts/ms_sans_serif.sfd | 1831 +++++++++++++++++++++++++++++++++++++++++++++-- fonts/ms_sans_serif.ttf | Bin 28572 -> 37276 bytes 2 files changed, 1768 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b71072b861cc396c4c50…

1 0