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

Jacek Caban : jscript: Make global constants non-writable in ES5 mode.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 6b1e54a28efb8cf2475ff2dedb4b158a16020850 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b1e54a28efb8cf2475ff2de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 14:43:40 2018 +0200 jscript: Make global constants non-writable in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/global.c | 7 ++++--- dlls/mshtml/tests/es5.js | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 6cd5ee9..732b020 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -1087,6 +1087,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) HRESULT init_global(script_ctx_t *ctx) { + unsigned const_flags = ctx->version >= SCRIPTLANGUAGEVERSION_ES5 ? 0 : PROPF_WRITABLE; jsdisp_t *math, *object_prototype, *constr; HRESULT hres; @@ -1137,14 +1138,14 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, undefinedW, jsval_undefined()); + hres = jsdisp_define_data_property(ctx->global, undefinedW, const_flags, jsval_undefined()); if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, NaNW, jsval_number(NAN)); + hres = jsdisp_define_data_property(ctx->global, NaNW, const_flags, jsval_number(NAN)); if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, InfinityW, jsval_number(INFINITY)); + hres = jsdisp_define_data_property(ctx->global, InfinityW, const_flags, jsval_number(INFINITY)); return hres; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 92024cf..c2e3e9f 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -284,6 +284,23 @@ function test_defineProperty() { next_test(); } +function test_global_properties() { + var o; + + /* Make sure that global properties are not writable. */ + o = NaN; + NaN = 1; + ok(isNaN(NaN), "NaN = " + NaN); + o = undefined; + undefined = 1; + ok(undefined === o, "NaN = " + NaN); + o = Infinity; + Infinity = 1; + ok(Infinity === o, "Infinity = " + NaN); + + next_test(); +} + var tests = [ test_date_now, test_toISOString, @@ -291,5 +308,6 @@ var tests = [ test_isArray, test_identifier_keywords, test_getOwnPropertyDescriptor, - test_defineProperty + test_defineProperty, + test_global_properties ];

1 0

Jacek Caban : jscript: Use jsdisp_define_property instead of jsdisp_propput_dontenum for global properties.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: ae8635db624087f60c548e7fecff7efa94bd6b81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae8635db624087f60c548e7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 14:43:52 2018 +0200 jscript: Use jsdisp_define_property instead of jsdisp_propput_dontenum for global properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/global.c | 58 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 732b020..cc2c3c1 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -978,7 +978,8 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, FunctionW, jsval_obj(ctx->function_constr)); + hres = jsdisp_define_data_property(ctx->global, FunctionW, PROPF_WRITABLE, + jsval_obj(ctx->function_constr)); if(FAILED(hres)) return hres; @@ -986,7 +987,8 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, ObjectW, jsval_obj(ctx->object_constr)); + hres = jsdisp_define_data_property(ctx->global, ObjectW, PROPF_WRITABLE, + jsval_obj(ctx->object_constr)); if(FAILED(hres)) return hres; @@ -994,7 +996,8 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, ArrayW, jsval_obj(ctx->array_constr)); + hres = jsdisp_define_data_property(ctx->global, ArrayW, PROPF_WRITABLE, + jsval_obj(ctx->array_constr)); if(FAILED(hres)) return hres; @@ -1002,7 +1005,8 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, BooleanW, jsval_obj(ctx->bool_constr)); + hres = jsdisp_define_data_property(ctx->global, BooleanW, PROPF_WRITABLE, + jsval_obj(ctx->bool_constr)); if(FAILED(hres)) return hres; @@ -1010,7 +1014,8 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, DateW, jsval_obj(ctx->date_constr)); + hres = jsdisp_define_data_property(ctx->global, DateW, PROPF_WRITABLE, + jsval_obj(ctx->date_constr)); if(FAILED(hres)) return hres; @@ -1018,35 +1023,43 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, ErrorW, jsval_obj(ctx->error_constr)); + hres = jsdisp_define_data_property(ctx->global, ErrorW, PROPF_WRITABLE, + jsval_obj(ctx->error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, EvalErrorW, jsval_obj(ctx->eval_error_constr)); + hres = jsdisp_define_data_property(ctx->global, EvalErrorW, PROPF_WRITABLE, + jsval_obj(ctx->eval_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, RangeErrorW, jsval_obj(ctx->range_error_constr)); + hres = jsdisp_define_data_property(ctx->global, RangeErrorW, PROPF_WRITABLE, + jsval_obj(ctx->range_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, ReferenceErrorW, jsval_obj(ctx->reference_error_constr)); + hres = jsdisp_define_data_property(ctx->global, ReferenceErrorW, PROPF_WRITABLE, + jsval_obj(ctx->reference_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, RegExpErrorW, jsval_obj(ctx->regexp_error_constr)); + hres = jsdisp_define_data_property(ctx->global, RegExpErrorW, PROPF_WRITABLE, + jsval_obj(ctx->regexp_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, SyntaxErrorW, jsval_obj(ctx->syntax_error_constr)); + hres = jsdisp_define_data_property(ctx->global, SyntaxErrorW, PROPF_WRITABLE, + jsval_obj(ctx->syntax_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, TypeErrorW, jsval_obj(ctx->type_error_constr)); + hres = jsdisp_define_data_property(ctx->global, TypeErrorW, PROPF_WRITABLE, + jsval_obj(ctx->type_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, URIErrorW, jsval_obj(ctx->uri_error_constr)); + hres = jsdisp_define_data_property(ctx->global, URIErrorW, PROPF_WRITABLE, + jsval_obj(ctx->uri_error_constr)); if(FAILED(hres)) return hres; @@ -1054,7 +1067,8 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, NumberW, jsval_obj(ctx->number_constr)); + hres = jsdisp_define_data_property(ctx->global, NumberW, PROPF_WRITABLE, + jsval_obj(ctx->number_constr)); if(FAILED(hres)) return hres; @@ -1062,7 +1076,8 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, RegExpW, jsval_obj(ctx->regexp_constr)); + hres = jsdisp_define_data_property(ctx->global, RegExpW, PROPF_WRITABLE, + jsval_obj(ctx->regexp_constr)); if(FAILED(hres)) return hres; @@ -1070,7 +1085,8 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, StringW, jsval_obj(ctx->string_constr)); + hres = jsdisp_define_data_property(ctx->global, StringW, PROPF_WRITABLE, + jsval_obj(ctx->string_constr)); if(FAILED(hres)) return hres; @@ -1078,7 +1094,8 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, VBArrayW, jsval_obj(ctx->vbarray_constr)); + hres = jsdisp_define_data_property(ctx->global, VBArrayW, PROPF_WRITABLE, + jsval_obj(ctx->vbarray_constr)); if(FAILED(hres)) return hres; @@ -1111,7 +1128,7 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, MathW, jsval_obj(math)); + hres = jsdisp_define_data_property(ctx->global, MathW, PROPF_WRITABLE, jsval_obj(math)); jsdisp_release(math); if(FAILED(hres)) return hres; @@ -1123,7 +1140,7 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, JSONW, jsval_obj(json)); + hres = jsdisp_define_data_property(ctx->global, JSONW, PROPF_WRITABLE, jsval_obj(json)); jsdisp_release(json); if(FAILED(hres)) return hres; @@ -1133,7 +1150,8 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, ActiveXObjectW, jsval_obj(constr)); + hres = jsdisp_define_data_property(ctx->global, ActiveXObjectW, PROPF_WRITABLE, + jsval_obj(constr)); jsdisp_release(constr); if(FAILED(hres)) return hres;

1 0

Zebediah Figura : mp3dmod: Return S_OK from SetInputType().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 4f868310a62858d45d8e701413f98d0e3ea330a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f868310a62858d45d8e7014… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 11 10:18:10 2018 -0500 mp3dmod: Return S_OK from SetInputType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 0f1f069..9592280 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -127,7 +127,7 @@ static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, { FIXME("(%p)->(%d, %p, %#x) stub!\n", iface, index, type, flags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags)

1 0

Zebediah Figura : mp3dmod: Implement SetOutputType().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 0c14a85d98cc512d2605d55f405d0b69bcca53ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c14a85d98cc512d2605d55f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 11 10:18:11 2018 -0500 mp3dmod: Implement SetOutputType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/Makefile.in | 2 +- dlls/mp3dmod/mp3dmod.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- include/mediaobj.idl | 5 +++++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index 5bcef48..0ac6d96 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,5 +1,5 @@ MODULE = mp3dmod.dll -IMPORTS = dmoguids uuid wmcodecdspuuid +IMPORTS = dmoguids msdmo uuid wmcodecdspuuid EXTRAINCL = $(MPG123_CFLAGS) EXTRALIBS = $(MPG123_LIBS) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 9592280..b9a4829 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -22,8 +22,11 @@ #include <mpg123.h> #include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "mmreg.h" #define COBJMACROS #include "objbase.h" +#include "dmo.h" #include "rpcproxy.h" #include "wmcodecdsp.h" #include "wine/debug.h" @@ -37,6 +40,7 @@ struct mp3_decoder { IMediaObject IMediaObject_iface; LONG ref; mpg123_handle *mh; + DMO_MEDIA_TYPE outtype; }; static inline struct mp3_decoder *impl_from_IMediaObject(IMediaObject *iface) @@ -132,9 +136,44 @@ static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - FIXME("(%p)->(%d, %p, %#x) stub!\n", iface, index, type, flags); + struct mp3_decoder *This = impl_from_IMediaObject(iface); + WAVEFORMATEX *format; + long enc; + int err; - return E_NOTIMPL; + TRACE("(%p)->(%d, %p, %#x)\n", iface, index, type, flags); + + if (flags & DMO_SET_TYPEF_CLEAR) + { + MoFreeMediaType(&This->outtype); + return S_OK; + } + + format = (WAVEFORMATEX *)type->pbFormat; + + if (format->wBitsPerSample == 8) + enc = MPG123_ENC_UNSIGNED_8; + else if (format->wBitsPerSample == 16) + enc = MPG123_ENC_SIGNED_16; + else + { + ERR("Cannot decode to bit depth %u.\n", format->wBitsPerSample); + return DMO_E_TYPE_NOT_ACCEPTED; + } + + if (!(flags & DMO_SET_TYPEF_TEST_ONLY)) + { + err = mpg123_format(This->mh, format->nSamplesPerSec, format->nChannels, enc); + if (err != MPG123_OK) + { + ERR("Failed to set format: %u channels, %u samples/sec, %u bits/sample.\n", + format->nChannels, format->nSamplesPerSec, format->wBitsPerSample); + return DMO_E_TYPE_NOT_ACCEPTED; + } + MoCopyMediaType(&This->outtype, type); + } + + return S_OK; } static HRESULT WINAPI MediaObject_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) @@ -277,6 +316,7 @@ static HRESULT create_mp3_decoder(REFIID iid, void **obj) mpg123_init(); This->mh = mpg123_new(NULL, &err); + mpg123_format_none(This->mh); return IMediaObject_QueryInterface(&This->IMediaObject_iface, iid, obj); } diff --git a/include/mediaobj.idl b/include/mediaobj.idl index 3c426f7..b6ae236 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -102,6 +102,11 @@ enum _DMO_INPLACE_PROCESS_FLAGS { DMO_INPLACE_ZERO = 0x00000001 }; +enum _DMO_SET_TYPE_FLAGS { + DMO_SET_TYPEF_TEST_ONLY = 0x00000001, + DMO_SET_TYPEF_CLEAR = 0x00000002, +}; + /***************************************************************************** * IMediaObject interface */

1 0

Zebediah Figura : mp3dmod: Implement ProcessInput().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: b5815f1dd3d44e4d73423c52d9d1f9cfbf1c4a2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5815f1dd3d44e4d73423c52… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 11 10:18:12 2018 -0500 mp3dmod: Implement ProcessInput(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index b9a4829..0d62468 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -41,6 +41,7 @@ struct mp3_decoder { LONG ref; mpg123_handle *mh; DMO_MEDIA_TYPE outtype; + IMediaBuffer *buffer; }; static inline struct mp3_decoder *impl_from_IMediaObject(IMediaObject *iface) @@ -256,10 +257,36 @@ static HRESULT WINAPI MediaObject_GetInputStatus(IMediaObject *iface, DWORD inde static HRESULT WINAPI MediaObject_ProcessInput(IMediaObject *iface, DWORD index, IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength) { - FIXME("(%p)->(%d, %p, %#x, %s, %s) stub!\n", iface, index, buffer, flags, + struct mp3_decoder *This = impl_from_IMediaObject(iface); + HRESULT hr; + BYTE *data; + DWORD len; + int err; + + TRACE("(%p)->(%d, %p, %#x, %s, %s)\n", iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); - return E_NOTIMPL; + if (This->buffer) + { + ERR("Already have a buffer.\n"); + return DMO_E_NOTACCEPTING; + } + + IMediaBuffer_AddRef(buffer); + This->buffer = buffer; + + hr = IMediaBuffer_GetBufferAndLength(buffer, &data, &len); + if (FAILED(hr)) + return hr; + + err = mpg123_feed(This->mh, data, len); + if (err != MPG123_OK) + { + ERR("mpg123_feed() failed: %s\n", mpg123_strerror(This->mh)); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) @@ -308,7 +335,7 @@ static HRESULT create_mp3_decoder(REFIID iid, void **obj) struct mp3_decoder *This; int err; - if (!(This = heap_alloc(sizeof(*This)))) + if (!(This = heap_alloc_zero(sizeof(*This)))) return E_OUTOFMEMORY; This->IMediaObject_iface.lpVtbl = &IMediaObject_vtbl; @@ -316,6 +343,7 @@ static HRESULT create_mp3_decoder(REFIID iid, void **obj) mpg123_init(); This->mh = mpg123_new(NULL, &err); + mpg123_open_feed(This->mh); mpg123_format_none(This->mh); return IMediaObject_QueryInterface(&This->IMediaObject_iface, iid, obj);

1 0

Zebediah Figura : mp3dmod: Implement ProcessOutput().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: a138090273a12f6c1e15f11f72a9b29c763bdc6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a138090273a12f6c1e15f11f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 11 10:18:13 2018 -0500 mp3dmod: Implement ProcessOutput(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++-- include/mediaobj.idl | 7 +++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 0d62468..d517c8e 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <mpg123.h> #include "windef.h" #include "winbase.h" @@ -289,11 +290,76 @@ static HRESULT WINAPI MediaObject_ProcessInput(IMediaObject *iface, DWORD index, return S_OK; } +static DWORD get_framesize(DMO_MEDIA_TYPE *type) +{ + WAVEFORMATEX *format = (WAVEFORMATEX *)type->pbFormat; + return 1152 * format->nBlockAlign; +} + static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { - FIXME("(%p)->(%x, %d, %p, %p) stub!\n", iface, flags, count, buffers, status); + struct mp3_decoder *This = impl_from_IMediaObject(iface); + DWORD len, maxlen, framesize; + int got_data = 0; + size_t written; + HRESULT hr; + BYTE *data; + int err; - return E_NOTIMPL; + TRACE("(%p)->(%#x, %d, %p, %p)\n", iface, flags, count, buffers, status); + + if (count > 1) + FIXME("Multiple buffers not handled.\n"); + + buffers[0].dwStatus = 0; + + if (!This->buffer) + return S_FALSE; + + buffers[0].dwStatus |= DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT; + + hr = IMediaBuffer_GetBufferAndLength(buffers[0].pBuffer, &data, &len); + if (FAILED(hr)) return hr; + + hr = IMediaBuffer_GetMaxLength(buffers[0].pBuffer, &maxlen); + if (FAILED(hr)) return hr; + + framesize = get_framesize(&This->outtype); + + while (1) + { + if (maxlen - len < framesize) + { + buffers[0].dwStatus |= DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE; + break; + } + + while ((err = mpg123_read(This->mh, data + len, framesize, &written)) == MPG123_NEW_FORMAT); + if (err == MPG123_NEED_MORE) + { + IMediaBuffer_Release(This->buffer); + This->buffer = NULL; + break; + } + else if (err == MPG123_ERR) + ERR("mpg123_read() failed: %s\n", mpg123_strerror(This->mh)); + else if (err != MPG123_OK) + ERR("mpg123_read() returned %d\n", err); + if (written < framesize) + ERR("short write: %zd/%u\n", written, framesize); + + got_data = 1; + + len += framesize; + hr = IMediaBuffer_SetLength(buffers[0].pBuffer, len); + if (FAILED(hr)) return hr; + } + + if (got_data) + { + return S_OK; + } + return S_FALSE; } static HRESULT WINAPI MediaObject_Lock(IMediaObject *iface, LONG lock) diff --git a/include/mediaobj.idl b/include/mediaobj.idl index b6ae236..7759921 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -107,6 +107,13 @@ enum _DMO_SET_TYPE_FLAGS { DMO_SET_TYPEF_CLEAR = 0x00000002, }; +enum _DMO_OUTPUT_DATA_BUFFERF_FLAGS { + DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT = 0x00000001, + DMO_OUTPUT_DATA_BUFFERF_TIME = 0x00000002, + DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH = 0x00000004, + DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE = 0x01000000, +}; + /***************************************************************************** * IMediaObject interface */

1 0

Dmitry Timoshkov : schedsvc: Pass full task file name to remove_job()/ add_job().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 0932d858aae649bfa4fc36e7207a84cad18b017d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0932d858aae649bfa4fc36e7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:26 2018 +0800 schedsvc: Pass full task file name to remove_job()/add_job(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 848e4fc..f021d63 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -118,8 +118,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); lstrcatW(path, info.data.FileName); - remove_job(info.data.FileName); - add_job(info.data.FileName); + remove_job(path); + add_job(path); break; default:

1 0

Dmitry Timoshkov : mstask: Don' t touch instance count field of the job file in the client.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: bfb7a0aa1fbf856a479e22311e0855380674edf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb7a0aa1fbf856a479e2231… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:28 2018 +0800 mstask: Don't touch instance count field of the job file in the client. It should be managed on the server side. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 986faa1..5ec7064 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1260,9 +1260,8 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta goto failed; } - /* Instance Count */ - word = 0; - if (!WriteFile(hfile, &word, sizeof(word), &size, NULL)) + /* Instance Count: don't touch it in the client */ + if (SetFilePointer(hfile, sizeof(word), NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { hr = HRESULT_FROM_WIN32(GetLastError()); goto failed;

1 0

Dmitry Timoshkov : mstask: Initialize more task fields from the job file on load.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 747cd087a90243c99d52058d798f03c79d9e1f5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=747cd087a90243c99d52058d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:31 2018 +0800 mstask: Initialize more task fields from the job file on load. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5ec7064..c99d51f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -58,6 +58,7 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; + UINT flags; HRESULT status; WORD idle_minutes, deadline_minutes; DWORD priority, maxRunTime; @@ -65,6 +66,7 @@ typedef struct DWORD trigger_count; TASK_TRIGGER *trigger; BOOL is_dirty; + USHORT instance_count; } TaskImpl; static inline TaskImpl *impl_from_ITask(ITask *iface) @@ -855,7 +857,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) const FIXDLEN_DATA *fixed; const SYSTEMTIME *st; DWORD unicode_strings_size, data_size, triggers_size; - USHORT instance_count, trigger_count, i; + USHORT trigger_count, i; const USHORT *signature; TASK_TRIGGER *task_trigger; @@ -888,7 +890,9 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) This->maxRunTime = fixed->maximum_runtime; TRACE("exit_code %#x\n", fixed->exit_code); TRACE("status %08x\n", fixed->status); + This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); + This->flags = fixed->flags; st = &fixed->last_runtime; TRACE("last_runtime %d/%d/%d wday %d %d:%d:%d.%03d\n", st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, @@ -901,8 +905,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) return SCHED_E_INVALID_TASK; } - instance_count = *(const USHORT *)(data + sizeof(*fixed)); - TRACE("instance count %u\n", instance_count); + This->instance_count = *(const USHORT *)(data + sizeof(*fixed)); + TRACE("instance count %u\n", This->instance_count); if (fixed->name_size_offset + sizeof(USHORT) < size) unicode_strings_size = load_unicode_strings(task, data + fixed->name_size_offset, size - fixed->name_size_offset); @@ -1463,6 +1467,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); + This->flags = 0; This->status = SCHED_S_TASK_NOT_SCHEDULED; This->idle_minutes = 10; This->deadline_minutes = 60; @@ -1471,6 +1476,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->trigger_count = 0; This->trigger = NULL; This->is_dirty = FALSE; + This->instance_count = 0; /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000;

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetFlags().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 8cfdaa45bb4f16a122dea40920a05bf29308843e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfdaa45bb4f16a122dea409… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:34 2018 +0800 mstask: Implement ITask::GetFlags(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index c99d51f..47ed4cb 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -489,8 +489,10 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags( static HRESULT WINAPI MSTASK_ITask_GetFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, flags); - *flags = 0; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, flags); + *flags = LOWORD(This->flags); return S_OK; }

1 0