January 2012 - Wine-commits

Jacek Caban : jscript: Get rid of unused SET_CALLED macro.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 2830a21e1daadd511099802d3a0f6c4f1a587691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2830a21e1daadd511099802d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 11:45:46 2012 +0100 jscript: Get rid of unused SET_CALLED macro. --- dlls/jscript/tests/activex.c | 3 --- dlls/jscript/tests/jscript.c | 3 --- dlls/jscript/tests/run.c | 3 --- 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index 1508ca0..dc90d91 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -39,9 +39,6 @@ static const CLSID CLSID_JScript = #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 7c81328..c453971 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -38,9 +38,6 @@ static const CLSID CLSID_JScript = #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index e5bd072..f83cedd 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -36,9 +36,6 @@ static const CLSID CLSID_JScript = #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \

1 0

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

27 Jan '12

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

Nikolay Sivov : msxml3: Support comment nodes in MXWriter.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: ac96be9c08f28c05af330ea4586cb5f2f88d33f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac96be9c08f28c05af330ea45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 15:13:54 2012 +0300 msxml3: Support comment nodes in MXWriter. --- dlls/msxml3/mxwriter.c | 19 ++++++++++++-- dlls/msxml3/tests/saxreader.c | 55 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 82f7ebd..a94fa51 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1155,11 +1155,24 @@ static HRESULT WINAPI SAXLexicalHandler_endCDATA(ISAXLexicalHandler *iface) return E_NOTIMPL; } -static HRESULT WINAPI SAXLexicalHandler_comment(ISAXLexicalHandler *iface, const WCHAR *chars, int len) +static HRESULT WINAPI SAXLexicalHandler_comment(ISAXLexicalHandler *iface, const WCHAR *chars, int nchars) { mxwriter *This = impl_from_ISAXLexicalHandler( iface ); - FIXME("(%p)->(%s): stub\n", This, debugstr_wn(chars, len)); - return E_NOTIMPL; + static const WCHAR copenW[] = {'<','!','-','-'}; + static const WCHAR ccloseW[] = {'-','-','>','\r','\n'}; + + TRACE("(%p)->(%s:%d)\n", This, debugstr_wn(chars, nchars), nchars); + + if (!chars) return E_INVALIDARG; + + close_element_starttag(This); + + write_output_buffer(This->buffer, copenW, sizeof(copenW)/sizeof(WCHAR)); + if (nchars) + write_output_buffer(This->buffer, chars, nchars); + write_output_buffer(This->buffer, ccloseW, sizeof(ccloseW)/sizeof(WCHAR)); + + return S_OK; } static const struct ISAXLexicalHandlerVtbl SAXLexicalHandlerVtbl = diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 33eefff..d05596e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2851,6 +2851,60 @@ static void test_mxwriter_dispex(void) IMXWriter_Release(writer); } +static void test_mxwriter_comment(void) +{ + static const WCHAR commentW[] = {'c','o','m','m','e','n','t',0}; + ISAXContentHandler *content; + ISAXLexicalHandler *lexical; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXLexicalHandler, (void**)&lexical); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXLexicalHandler_comment(lexical, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_comment(lexical, commentW, 0); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXLexicalHandler_comment(lexical, commentW, sizeof(commentW)/sizeof(WCHAR)-1); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("\r\n\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + ISAXLexicalHandler_Release(lexical); + IMXWriter_Release(writer); + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -2886,6 +2940,7 @@ START_TEST(saxreader) test_mxwriter_startenddocument(); test_mxwriter_startendelement(); test_mxwriter_characters(); + test_mxwriter_comment(); test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream();

1 0

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

27 Jan '12

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 Courier font.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: a926bfdb061ffcdc3c6f88b29fca614f9f12fa78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a926bfdb061ffcdc3c6f88b29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 19:16:25 2012 +0100 fonts: Add some missing glyphs in the Courier font. --- fonts/courier.sfd | 977 ++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/courier.ttf | Bin 14288 -> 17300 bytes 2 files changed, 972 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a926bfdb061ffcdc3c6f8…

1 0

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

26 Jan '12

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: ad1a3d3cfcb938d45f977efe0229e2a9afdc5095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1a3d3cfcb938d45f977efe0… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jan 26 20:29:02 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index d5de1de..c79ff10 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: 2012-01-24 22:52+0300\n" +"PO-Revision-Date: 2012-01-26 20:28+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -9920,9 +9920,8 @@ msgstr "" "\n" #: cmd.rc:318 -#, fuzzy msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "Tomo vardas (11 simbolių, ĮVESTI – bevardis)?" +msgstr "Tomo vardas (11 simbolių, <Įvesti> – bevardis)?" #: cmd.rc:319 msgid "PATH not found\n" @@ -14054,9 +14053,8 @@ msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Neteisingas parametras „%1“ – pagalba: xcopy /?\n" #: xcopy.rc:29 -#, fuzzy msgid "Press <Enter> to begin copying\n" -msgstr "Spauskite <įvesti> kopijavimui pradėti\n" +msgstr "Spauskite <Įvesti> kopijavimui pradėti\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n"

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: e79644e6a96eae419082ec78ce8ff3294888d05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79644e6a96eae419082ec78c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 26 13:28:33 2012 -0700 po: Update Catalan translation. --- po/ca.po | 735 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 321 insertions(+), 414 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e79644e6a96eae419082e…

1 0

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

26 Jan '12

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

Jörg Höhle : winealsa: Initialize can fail with AUDCLNT_E_ENDPOINT_CREATE_FAILED.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 4bbdc31d4ff30b6611dbcf29dbaddd0dce3b87ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bbdc31d4ff30b6611dbcf29d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 23 19:27:05 2011 +0200 winealsa: Initialize can fail with AUDCLNT_E_ENDPOINT_CREATE_FAILED. --- dlls/winealsa.drv/mmdevdrv.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index bcbe06c..af94add 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -901,14 +901,14 @@ static HRESULT WINAPI AudioClient_Initialize(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_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_hw_params_set_access(This->pcm_handle, This->hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0){ WARN("Unable to set access: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } @@ -922,7 +922,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, format)) < 0){ WARN("Unable to set ALSA format to %u: %d (%s)\n", format, err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; } @@ -933,7 +933,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, &rate, NULL)) < 0){ WARN("Unable to set rate to %u: %d (%s)\n", rate, err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; } @@ -941,7 +941,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, fmt->nChannels)) < 0){ WARN("Unable to set channels to %u: %d (%s)\n", fmt->nChannels, err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; } @@ -972,21 +972,21 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if((err = snd_pcm_hw_params(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to set hw params: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_hw_params_get_period_size(This->hw_params, &This->alsa_period_frames, NULL)) < 0){ WARN("Unable to get period size: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_hw_params_get_buffer_size(This->hw_params, &This->alsa_bufsize_frames)) < 0){ WARN("Unable to get buffer size: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } @@ -998,14 +998,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if((err = snd_pcm_sw_params_current(This->pcm_handle, sw_params)) < 0){ WARN("Unable to get sw_params: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_sw_params_set_start_threshold(This->pcm_handle, sw_params, 1)) < 0){ WARN("Unable set start threshold to 0: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } @@ -1013,19 +1013,19 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, sw_params, This->alsa_bufsize_frames)) < 0){ WARN("Unable set stop threshold to %lu: %d (%s)\n", This->alsa_bufsize_frames, err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_sw_params(This->pcm_handle, sw_params)) < 0){ - WARN("Unable set sw params: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + WARN("Unable to set sw params: %d (%s)\n", err, snd_strerror(err)); + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_prepare(This->pcm_handle)) < 0){ WARN("Unable to prepare device: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; }

1 0