May 2016 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Added RegExp.global getter implementation.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: b1773131ac85567e7781ecefc5ff54740fedf774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1773131ac85567e7781ecefc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 14:08:03 2016 +0200 jscript: Added RegExp.global getter implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 6 ++++-- dlls/jscript/tests/regexp.js | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index be9f8d8..e4fae22 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -264,8 +264,10 @@ static HRESULT RegExp_set_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t va static HRESULT RegExp_get_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + *r = jsval_bool(!!(regexp_from_jsdisp(jsthis)->jsregexp->flags & REG_GLOB)); + return S_OK; } static HRESULT RegExp_set_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 48f65bc..b200364 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -663,13 +663,18 @@ ok(/abc/.toString(1, false, "3") === "/abc/", "/abc/.toString(1, false, \"3\") = re = /x/; ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); re = /x/i; ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); re = new RegExp("xxx", "gi"); ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === true, "re.global = " + re.global); re = /x/mg; +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === true, "re.multiline = " + re.multiline); +ok(re.global === true, "re.global = " + re.global); reportSuccess();

1 0

Jacek Caban : jscript: Removed obsolete FIXME comments in tests and add relevant tests.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: a8b5dc84bd98662ddfe4d8b50c4c558bbdf0c22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b5dc84bd98662ddfe4d8b50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 14:08:15 2016 +0200 jscript: Removed obsolete FIXME comments in tests and add relevant tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index a9f95f8..ee30836 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -208,10 +208,13 @@ function argumentsTest() { return 1; }); } -/* FIXME: It seems that when function is called as an expression, instance object arguments is not set. - * We currently always set it in Wine. */ + argumentsTest(); +(function callAsExprTest() { + ok(callAsExprTest.arguments === null, "callAsExprTest.arguments = " + callAsExprTest.arguments); +})(1,2); + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;");

1 0

Andrey Gusev : msxml3/tests: Fix a typo in variable name.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 73152bd347a4047f02d1bb200ceedd69f99afc13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73152bd347a4047f02d1bb200… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 22 20:18:40 2016 +0300 msxml3/tests: Fix a typo in variable name. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index de28a70..f6e33d3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6704,9 +6704,9 @@ static void test_TransformWithLoadingLocalFile(void) BSTR sPart1 = _bstr_(szBasicTransformSSXMLPart1); BSTR sPart2 = _bstr_(szBasicTransformSSXMLPart2); BSTR sFileName = _bstr_(lpPathBuffer); - int nLegnth = lstrlenW(sPart1) + lstrlenW(sPart2) + lstrlenW(sFileName) + 1; + int nLength = lstrlenW(sPart1) + lstrlenW(sPart2) + lstrlenW(sFileName) + 1; - sXSL = SysAllocStringLen(NULL, nLegnth); + sXSL = SysAllocStringLen(NULL, nLength); lstrcpyW(sXSL, sPart1); lstrcatW(sXSL, sFileName); lstrcatW(sXSL, sPart2);

1 0

Jeremy Newman : update requirements
by Jeremy Newman 24 May '16

24 May '16

Module: website Branch: master Commit: debbdf0dd315f88974e072e3b25b2a90c8c87d5e URL: http://source.winehq.org/git/website.git/?a=commit;h=debbdf0dd315f88974e072… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue May 24 15:01:45 2016 -0500 update requirements --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 6e8761f..bca104c 100644 --- a/README +++ b/README @@ -4,9 +4,9 @@ by Jeremy Newman <jnewman(a)codeweavers.com> ----------------------------------------------------------------------- Installation Requirements: - * Apache 2.0 or higher + * Apache 2.4 or higher * mod_rewrite enabled in Apache config - * PHP 5.4 or higher + * PHP 5.6 or higher Setting Up: -----------------------------------------------------------------------

1 0

Hugh McMaster : reg: Inform users about the 'add/delete/query /?' command.
by Alexandre Julliard 24 May '16

24 May '16

1 0

Alexandre Julliard : secur32/tests: Relax the certificate check a little.
by Alexandre Julliard 24 May '16

24 May '16

Module: wine Branch: master Commit: a0fe286174912551c7d1fc552455abb0577d0a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0fe286174912551c7d1fc552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:11:08 2016 +0900 secur32/tests: Relax the certificate check a little. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 51c22d5..f5cfd50 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -640,7 +640,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 2 || cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Fabian Maurer : msacm32: Added converter for ADPCM to PCM 8 bit mono.
by Alexandre Julliard 24 May '16

24 May '16

Module: wine Branch: master Commit: 351bd33f2cd1edd680176ef777d77a3d1256ab6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=351bd33f2cd1edd680176ef77… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon May 23 22:35:30 2016 +0200 msacm32: Added converter for ADPCM to PCM 8 bit mono. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 85 ++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 30 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index c5c65f6..4684f30 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -179,6 +179,25 @@ static inline void W16(unsigned char* dst, short s) dst[1] = HIBYTE(s); } +/*********************************************************************** + * W8 + * + * Write a 8 bit sample + */ +static inline void W8(unsigned char* dst, short s) +{ + dst[0] = (unsigned char)((s + 32768) >> 8); +} + + +static inline void W8_16(unsigned char* dst, short s, int bytes) +{ + if(bytes == 1) + W8(dst, s); + else + W16(dst, s); +} + /* IMA (or DVI) APDCM codec routines */ static const unsigned IMA_StepTable[89] = @@ -339,43 +358,43 @@ static void cvtSSima16K(PACMDRVSTREAMINSTANCE adsi, } } -static void cvtMMima16K(PACMDRVSTREAMINSTANCE adsi, - const unsigned char* src, LPDWORD nsrc, - unsigned char* dst, LPDWORD ndst) +static void cvtMMimaK(PACMDRVSTREAMINSTANCE adsi, + const unsigned char* src, LPDWORD nsrc, + unsigned char* dst, LPDWORD ndst) { - int sample; - int stepIndex; - int nsamp_blk = ((LPIMAADPCMWAVEFORMAT)adsi->pwfxSrc)->wSamplesPerBlock; - int nsamp; + int sample; + int stepIndex; + int nsamp_blk = ((LPIMAADPCMWAVEFORMAT)adsi->pwfxSrc)->wSamplesPerBlock; + int nsamp; + int bytesPerSample = adsi->pwfxDst->wBitsPerSample / 8; /* compute the number of entire blocks we can decode... * it's the min of the number of entire blocks in source buffer and the number * of entire blocks in destination buffer */ - DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2)); + DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, *ndst / (nsamp_blk * bytesPerSample)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2; + *ndst = nblock * nsamp_blk * bytesPerSample; nsamp_blk--; /* remove the sample in block header */ for (; nblock > 0; nblock--) { - const unsigned char* in_src = src; + const unsigned char* in_src = src; - /* handle header first */ - sample = R16(src); - stepIndex = (unsigned)*(src + 2); + /* handle header first */ + sample = R16(src); + stepIndex = (unsigned)*(src + 2); clamp_step_index(&stepIndex); - src += 4; - W16(dst, sample); dst += 2; + src += 4; + W8_16(dst, sample, bytesPerSample); dst += bytesPerSample; - for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) { process_nibble(*src, &stepIndex, &sample); - W16(dst, sample); dst += 2; + W8_16(dst, sample, bytesPerSample); dst += bytesPerSample; process_nibble(*src++ >> 4, &stepIndex, &sample); - W16(dst, sample); dst += 2; - } + W8_16(dst, sample, bytesPerSample); dst += bytesPerSample; + } /* we have now to realign the source pointer on block */ src = in_src + adsi->pwfxSrc->nBlockAlign; } @@ -733,13 +752,14 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_IMA_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* resampling or mono <=> stereo not available + /* resampling or mono <=> stereo not available * ADPCM algo only define 16 bit per sample output + * (The API seems to still allow 8 bit per sample output) */ - if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || - adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || - adsi->pwfxDst->wBitsPerSample != 16) - goto theEnd; + if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || + adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || + (adsi->pwfxDst->wBitsPerSample != 16 && adsi->pwfxDst->wBitsPerSample != 8)) + goto theEnd; nspb = ((LPIMAADPCMWAVEFORMAT)adsi->pwfxSrc)->wSamplesPerBlock; TRACE("spb=%u\n", nspb); @@ -752,11 +772,16 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) if ((((nspb - 1) / 2) + 4) * adsi->pwfxSrc->nChannels < adsi->pwfxSrc->nBlockAlign) goto theEnd; - /* adpcm decoding... */ - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) - aad->convert = cvtSSima16K; - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) - aad->convert = cvtMMima16K; + /* adpcm decoding... */ + if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) + aad->convert = cvtSSima16K; + if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) + aad->convert = cvtMMimaK; + if (adsi->pwfxDst->wBitsPerSample == 8 && adsi->pwfxDst->nChannels == 1) + aad->convert = cvtMMimaK; + /* FIXME: Stereo support for 8bit samples*/ + if (adsi->pwfxDst->wBitsPerSample == 8 && adsi->pwfxDst->nChannels == 2) + goto theEnd; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_IMA_ADPCM)

1 0

Hugh McMaster : reg: Update general help logic.
by Alexandre Julliard 24 May '16

24 May '16

1 0

Hugh McMaster : reg: Update the general usage message.
by Alexandre Julliard 24 May '16

24 May '16

Module: wine Branch: master Commit: 859ff854a1249f3ab671bbdc168261d82f210009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859ff854a1249f3ab671bbdc1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue May 24 12:48:37 2016 +0000 reg: Update the general usage message. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 73 ++++++++++++++++++++++++----------------------- po/bg.po | 69 +++++++++++++++++++++++--------------------- po/ca.po | 73 ++++++++++++++++++++++++----------------------- po/cs.po | 69 +++++++++++++++++++++++--------------------- po/da.po | 73 ++++++++++++++++++++++++----------------------- po/de.po | 73 ++++++++++++++++++++++++----------------------- po/el.po | 69 +++++++++++++++++++++++--------------------- po/en.po | 80 +++++++++++++++++++++++++++++----------------------- po/en_US.po | 80 +++++++++++++++++++++++++++++----------------------- po/eo.po | 69 +++++++++++++++++++++++--------------------- po/es.po | 73 ++++++++++++++++++++++++----------------------- po/fa.po | 69 +++++++++++++++++++++++--------------------- po/fi.po | 73 ++++++++++++++++++++++++----------------------- po/fr.po | 73 ++++++++++++++++++++++++----------------------- po/he.po | 73 ++++++++++++++++++++++++----------------------- po/hi.po | 69 +++++++++++++++++++++++--------------------- po/hr.po | 73 ++++++++++++++++++++++++----------------------- po/hu.po | 73 ++++++++++++++++++++++++----------------------- po/it.po | 73 ++++++++++++++++++++++++----------------------- po/ja.po | 73 ++++++++++++++++++++++++----------------------- po/ko.po | 73 ++++++++++++++++++++++++----------------------- po/lt.po | 73 ++++++++++++++++++++++++----------------------- po/ml.po | 69 +++++++++++++++++++++++--------------------- po/nb_NO.po | 73 ++++++++++++++++++++++++----------------------- po/nl.po | 73 ++++++++++++++++++++++++----------------------- po/or.po | 69 +++++++++++++++++++++++--------------------- po/pa.po | 69 +++++++++++++++++++++++--------------------- po/pl.po | 73 ++++++++++++++++++++++++----------------------- po/pt_BR.po | 73 ++++++++++++++++++++++++----------------------- po/pt_PT.po | 73 ++++++++++++++++++++++++----------------------- po/rm.po | 69 +++++++++++++++++++++++--------------------- po/ro.po | 73 ++++++++++++++++++++++++----------------------- po/ru.po | 73 ++++++++++++++++++++++++----------------------- po/sk.po | 69 +++++++++++++++++++++++--------------------- po/sl.po | 73 ++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 69 +++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 69 +++++++++++++++++++++++--------------------- po/sv.po | 73 ++++++++++++++++++++++++----------------------- po/te.po | 69 +++++++++++++++++++++++--------------------- po/th.po | 69 +++++++++++++++++++++++--------------------- po/tr.po | 73 ++++++++++++++++++++++++----------------------- po/uk.po | 73 ++++++++++++++++++++++++----------------------- po/wa.po | 69 +++++++++++++++++++++++--------------------- po/wine.pot | 69 +++++++++++++++++++++++--------------------- po/zh_CN.po | 73 ++++++++++++++++++++++++----------------------- po/zh_TW.po | 73 ++++++++++++++++++++++++----------------------- programs/reg/reg.rc | 7 ++++- 47 files changed, 1724 insertions(+), 1587 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=859ff854a1249f3ab671b…

1 0

Henri Verbeet : wined3d: Introduce a helper function to allocate arrays.
by Alexandre Julliard 24 May '16

24 May '16

Module: wine Branch: master Commit: 8ae3a9b62487a006bfa666407dd67ce2d1fd62c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae3a9b62487a006bfa666407… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 23 18:06:27 2016 +0200 wined3d: Introduce a helper function to allocate arrays. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++--- dlls/wined3d/buffer.c | 23 +++++++++++------------ dlls/wined3d/context.c | 23 ++++++++--------------- dlls/wined3d/cs.c | 3 +-- dlls/wined3d/device.c | 10 ++++------ dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/glsl_shader.c | 8 +++----- dlls/wined3d/shader.c | 13 ++++++------- dlls/wined3d/state.c | 6 +----- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 17 ++++++++--------- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/utils.c | 3 +-- dlls/wined3d/vertexdeclaration.c | 7 +++---- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_main.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 7 +++++++ 17 files changed, 66 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ae3a9b62487a006bfa66…

1 0