wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

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: 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

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

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_const.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 4555828c57c918d99cd91fcb469b8ebda243f5b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4555828c57c918d99cd91fcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 14:43:28 2018 +0200 jscript: Use jsdisp_define_property instead of jsdisp_propput_const. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 6 ++++++ dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.h | 2 +- dlls/jscript/math.c | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 7a2879a..714f3a4 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1701,3 +1701,9 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t prop->flags = (prop->flags & ~desc->mask) | (desc->flags & desc->mask); return S_OK; } + +HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned flags, jsval_t value) +{ + property_desc_t prop_desc = { flags, flags, TRUE, value }; + return jsdisp_define_property(obj, name, &prop_desc); +} diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index af0b9a4..040bcc5 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -655,7 +655,8 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, return hres; if(builtin_info) - hres = jsdisp_propput_const(&function->dispex, lengthW, jsval_number(function->length)); + hres = jsdisp_define_data_property(&function->dispex, lengthW, 0, + jsval_number(function->length)); if(SUCCEEDED(hres)) hres = set_prototype(ctx, &function->dispex, prototype); if(FAILED(hres)) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2beee26..40e99f3 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -284,7 +284,6 @@ HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget(jsdisp_t*,DISPID,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput(jsdisp_t*,const WCHAR*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; -HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_dontenum(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; @@ -295,6 +294,7 @@ HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*) DECLSPEC_HIDDE HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC_HIDDEN; +HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index ef906f5..109df9d 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -559,7 +559,8 @@ HRESULT create_math(script_ctx_t *ctx, jsdisp_t **ret) } for(i=0; i < sizeof(constants)/sizeof(*constants); i++) { - hres = jsdisp_propput_const(math, constants[i].name, jsval_number(constants[i].val)); + hres = jsdisp_define_data_property(math, constants[i].name, 0, + jsval_number(constants[i].val)); if(FAILED(hres)) { jsdisp_release(math); return hres;

1 0

Jacek Caban : jscript: Add Object.defineProperty implementation.
by Alexandre Julliard 11 May '18

11 May '18

1 0

Louis Lenders : atmlib: Add stub for ATMFinish.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: c5d0bad48ee42614b49f6666381b2804a09b66a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d0bad48ee42614b49f6666… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri May 11 14:31:10 2018 +0200 atmlib: Add stub for ATMFinish. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atmlib/atmlib.spec | 2 +- dlls/atmlib/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/atmlib/atmlib.spec b/dlls/atmlib/atmlib.spec index 387486d..dc55548 100644 --- a/dlls/atmlib/atmlib.spec +++ b/dlls/atmlib/atmlib.spec @@ -16,7 +16,7 @@ @ stub ATMEnumMMFonts @ stub ATMEnumMMFontsA @ stub ATMEnumMMFontsW -@ stub ATMFinish +@ stdcall ATMFinish() @ stub ATMFontAvailable @ stub ATMFontAvailableA @ stub ATMFontAvailableW diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c index 0baca00..efae51f 100644 --- a/dlls/atmlib/main.c +++ b/dlls/atmlib/main.c @@ -45,3 +45,9 @@ BOOL WINAPI ATMProperlyLoaded(void) FIXME("stub\n"); return FALSE; } + +int WINAPI ATMFinish(void) +{ + FIXME("stub\n"); + return 0; +}

1 0

Józef Kucia : winebus: Print SDL error message when SDL cannot be initialized.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 142169960acacf673266f29dcf81e0427046e553 URL: https://source.winehq.org/git/wine.git/?a=commit;h=142169960acacf673266f29d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 11 10:06:40 2018 +0200 winebus: Print SDL error message when SDL cannot be initialized. SDL_Init(SDL_INIT_HAPTIC) fails if SDL is built without haptic support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 03e7cb3..159727f 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -910,7 +910,7 @@ static DWORD CALLBACK deviceloop_thread(void *args) if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) { - ERR("Can't Init SDL\n"); + ERR("Can't init SDL: %s\n", pSDL_GetError()); return STATUS_UNSUCCESSFUL; }

1 0

Nikolay Sivov : user32/menu: Return locked menu data when looking for menu items.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 387ba1d605b60499d1e173f93167397ce84da685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=387ba1d605b60499d1e173f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 9 15:50:48 2018 +0300 user32/menu: Return locked menu data when looking for menu items. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 564 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 352 insertions(+), 212 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=387ba1d605b60499d1e1…

1 0

Dmitry Timoshkov : mstask: Add stdcall to cdecl thunks for AT Service RPC API.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: f3f2eeb88c076ee1dbe28119cd0c26b4480dbcd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3f2eeb88c076ee1dbe28119… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 18:30:52 2018 +0800 mstask: Add stdcall to cdecl thunks for AT Service RPC API. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/mstask.spec | 16 ++++++++-------- dlls/mstask/mstask_main.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index dcfb20c..df8ea7a 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -2,10 +2,10 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub GetNetScheduleAccountInformation -@ stdcall NetrJobAdd(wstr ptr ptr) -@ stdcall NetrJobDel(wstr long long) -@ stdcall NetrJobEnum(wstr ptr long ptr ptr) -@ stdcall NetrJobGetInfo(wstr long ptr) +@ stdcall NetrJobAdd(wstr ptr ptr) NetrJobAdd_wrapper +@ stdcall NetrJobDel(wstr long long) NetrJobDel_wrapper +@ stdcall NetrJobEnum(wstr ptr long ptr ptr) NetrJobEnum_wrapper +@ stdcall NetrJobGetInfo(wstr long ptr) NetrJobGetInfo_wrapper @ stub SAGetAccountInformation @ stub SAGetNSAccountInformation @ stub SASetAccountInformation @@ -15,10 +15,10 @@ @ stub _DllCanUnloadNow@0 @ stub _DllGetClassObject@12 @ stub _GetNetScheduleAccountInformation@12 -@ stdcall _NetrJobAdd@12(wstr ptr ptr) NetrJobAdd -@ stdcall _NetrJobDel@12(wstr long long) NetrJobDel -@ stdcall _NetrJobEnum@20(wstr ptr long ptr ptr) NetrJobEnum -@ stdcall _NetrJobGetInfo@12(wstr long ptr) NetrJobGetInfo +@ stdcall _NetrJobAdd@12(wstr ptr ptr) NetrJobAdd_wrapper +@ stdcall _NetrJobDel@12(wstr long long) NetrJobDel_wrapper +@ stdcall _NetrJobEnum@20(wstr ptr long ptr ptr) NetrJobEnum_wrapper +@ stdcall _NetrJobGetInfo@12(wstr long ptr) NetrJobGetInfo_wrapper @ stub _SAGetAccountInformation@16 @ stub _SAGetNSAccountInformation@12 @ stub _SASetAccountInformation@20 diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index c1e903681..e747af6 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -79,6 +79,27 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( hInst ); } +DWORD WINAPI NetrJobAdd_wrapper(ATSVC_HANDLE server_name, LPAT_INFO info, LPDWORD jobid) +{ + return NetrJobAdd(server_name, info, jobid); +} + +DWORD WINAPI NetrJobDel_wrapper(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) +{ + return NetrJobDel(server_name, min_jobid, max_jobid); +} + +DWORD WINAPI NetrJobEnum_wrapper(ATSVC_HANDLE server_name, LPAT_ENUM_CONTAINER container, + DWORD max_length, LPDWORD total, LPDWORD resume) +{ + return NetrJobEnum(server_name, container, max_length, total, resume); +} + +DWORD WINAPI NetrJobGetInfo_wrapper(ATSVC_HANDLE server_name, DWORD jobid, LPAT_INFO *info) +{ + return NetrJobGetInfo(server_name, jobid, info); +} + DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { return HeapAlloc(GetProcessHeap(), 0, n);

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018