July 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Do not assume that vtable is the first element of the object.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 022824100e94b3af8fc85f3e3d6efcc7623cfb11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=022824100e94b3af8fc85f3e3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:01:27 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object. --- dlls/windowscodecs/bmpdecode.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 6da6a3c..1a1ee0a 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -94,6 +94,8 @@ static inline BmpDecoder *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, void **ppv) { + BmpDecoder *This = impl_from_IWICBitmapFrameDecode(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -102,7 +104,7 @@ static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface IsEqualIID(&IID_IWICBitmapSource, iid) || IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) { - *ppv = iface; + *ppv = &This->IWICBitmapFrameDecode_iface; } else { @@ -964,9 +966,10 @@ static HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID if (!ppv) return E_INVALIDARG; - if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapDecoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapDecoder_iface; } else {

1 0

Dmitry Timoshkov : windowscodecs: Do not assume that vtable is the first element of the object.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 9fecb853a4f1b06e884cd02d1610a03ccc44b4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fecb853a4f1b06e884cd02d1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:02:20 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object. --- dlls/windowscodecs/bmpencode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index dfef7f4..27922e7 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -87,7 +87,7 @@ static HRESULT WINAPI BmpFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapFrameEncode_iface; } else { @@ -434,7 +434,7 @@ static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapEncoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapEncoder_iface; } else {

1 0

Dmitry Timoshkov : windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 2a35901a90a1bc59b78f7d1ae2f3f8f8c8e0e860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a35901a90a1bc59b78f7d1ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:03:20 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts. --- dlls/windowscodecs/clsfactory.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 40c8df3..6a81a9d 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -82,9 +82,10 @@ static HRESULT WINAPI ClassFactoryImpl_QueryInterface(IClassFactory *iface, if (!ppv) return E_INVALIDARG; - if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IClassFactory, iid)) + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IClassFactory, iid)) { - *ppv = This; + *ppv = &This->IClassFactory_iface; } else { @@ -155,8 +156,8 @@ static HRESULT ClassFactoryImpl_Constructor(classinfo *info, REFIID riid, LPVOID This->ref = 1; This->info = info; - ret = IClassFactory_QueryInterface((IClassFactory*)This, riid, ppv); - IClassFactory_Release((IClassFactory*)This); + ret = IClassFactory_QueryInterface(&This->IClassFactory_iface, riid, ppv); + IClassFactory_Release(&This->IClassFactory_iface); return ret; }

1 0

Jacek Caban : jscript: Use prototype for builtin Date properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 175c4ddad5efa19a1cb4d0a12669792adef39e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=175c4ddad5efa19a1cb4d0a12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:17:06 2012 +0200 jscript: Use prototype for builtin Date properties. --- dlls/jscript/date.c | 10 +++++++++- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 465f7b2..f5cf591 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2110,6 +2110,14 @@ static const builtin_info_t Date_info = { NULL }; +static const builtin_info_t DateInst_info = { + JSCLASS_DATE, + {NULL, Date_value, 0}, + 0, NULL, + NULL, + NULL +}; + static HRESULT create_date(script_ctx_t *ctx, jsdisp_t *object_prototype, DOUBLE time, jsdisp_t **ret) { DateInstance *date; @@ -2125,7 +2133,7 @@ static HRESULT create_date(script_ctx_t *ctx, jsdisp_t *object_prototype, DOUBLE if(object_prototype) hres = init_dispex(&date->dispex, ctx, &Date_info, object_prototype); else - hres = init_dispex_from_constr(&date->dispex, ctx, &Date_info, ctx->date_constr); + hres = init_dispex_from_constr(&date->dispex, ctx, &DateInst_info, ctx->date_constr); if(FAILED(hres)) { heap_free(date); return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 3d8d67a..a723f6e 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -222,6 +222,11 @@ ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); ok(!Boolean.hasOwnProperty('toString'), "Boolean.hasOwnProperty('toString') is true"); ok(Boolean.prototype.hasOwnProperty('toString'), "Boolean.prototype.hasOwnProperty('toString') is false"); +obj = new Date(); +ok(!obj.hasOwnProperty('getTime'), "obj.hasOwnProperty('getTime') is true"); +ok(!Date.hasOwnProperty('getTime'), "Date.hasOwnProperty('getTime') is true"); +ok(Date.prototype.hasOwnProperty('getTime'), "Date.prototype.hasOwnProperty('getTime') is false"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Jacek Caban : jscript: Use prototype for builtin Number properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 3b80361a707109cd57e70dac5c05e76c33dcf9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b80361a707109cd57e70dac5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:17:19 2012 +0200 jscript: Use prototype for builtin Number properties. --- dlls/jscript/number.c | 10 +++++++++- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index d2de790..9107005 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -543,6 +543,14 @@ static const builtin_info_t Number_info = { NULL }; +static const builtin_info_t NumberInst_info = { + JSCLASS_NUMBER, + {NULL, Number_value, 0}, + 0, NULL, + NULL, + NULL +}; + static HRESULT NumberConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) { @@ -605,7 +613,7 @@ static HRESULT alloc_number(script_ctx_t *ctx, jsdisp_t *object_prototype, Numbe if(object_prototype) hres = init_dispex(&number->dispex, ctx, &Number_info, object_prototype); else - hres = init_dispex_from_constr(&number->dispex, ctx, &Number_info, ctx->number_constr); + hres = init_dispex_from_constr(&number->dispex, ctx, &NumberInst_info, ctx->number_constr); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a723f6e..fc787a9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -227,6 +227,11 @@ ok(!obj.hasOwnProperty('getTime'), "obj.hasOwnProperty('getTime') is true"); ok(!Date.hasOwnProperty('getTime'), "Date.hasOwnProperty('getTime') is true"); ok(Date.prototype.hasOwnProperty('getTime'), "Date.prototype.hasOwnProperty('getTime') is false"); +obj = new Number(); +ok(!obj.hasOwnProperty('toFixed'), "obj.hasOwnProperty('toFixed') is true"); +ok(!Number.hasOwnProperty('toFixed'), "Number.hasOwnProperty('toFixed') is true"); +ok(Number.prototype.hasOwnProperty('toFixed'), "Number.prototype.hasOwnProperty('toFixed') is false"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Jacek Caban : jscript: Use prototype for builtin Array properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 6e4f74f71b640db7eb7fd0f9b1a7ea6996177607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4f74f71b640db7eb7fd0f9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:15:53 2012 +0200 jscript: Use prototype for builtin Array properties. --- dlls/jscript/array.c | 15 ++++++++++++++- dlls/jscript/tests/api.js | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 6881412..856e063 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1100,6 +1100,19 @@ static const builtin_info_t Array_info = { Array_on_put }; +static const builtin_prop_t ArrayInst_props[] = { + {lengthW, Array_length, 0} +}; + +static const builtin_info_t ArrayInst_info = { + JSCLASS_ARRAY, + {NULL, Array_value, 0}, + sizeof(ArrayInst_props)/sizeof(*ArrayInst_props), + ArrayInst_props, + Array_destructor, + Array_on_put +}; + static HRESULT ArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) { @@ -1161,7 +1174,7 @@ static HRESULT alloc_array(script_ctx_t *ctx, jsdisp_t *object_prototype, ArrayI if(object_prototype) hres = init_dispex(&array->dispex, ctx, &Array_info, object_prototype); else - hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->array_constr); + hres = init_dispex_from_constr(&array->dispex, ctx, &ArrayInst_info, ctx->array_constr); if(FAILED(hres)) { heap_free(array); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f8885dd..4675e08 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -211,6 +211,12 @@ ok(!Object.hasOwnProperty('isPrototypeOf'), "Object.hasOwnProperty('isPrototypeO ok(!parseFloat.hasOwnProperty('call'), "parseFloat.hasOwnProperty('call') is true"); ok(!Function.hasOwnProperty('call'), "Function.hasOwnProperty('call') is true"); +obj = new Array(); +ok(Array.prototype.hasOwnProperty('sort'), "Array.prototype.hasOwnProperty('sort') is false"); +ok(Array.prototype.hasOwnProperty('length'), "Array.prototype.hasOwnProperty('length') is false"); +ok(!obj.hasOwnProperty('sort'), "obj.hasOwnProperty('sort') is true"); +ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is true"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Jacek Caban : jscript: Use prototype for builtin Boolean properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 5058c1d12d632043133da233e1ab15c968b8fa28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5058c1d12d632043133da233e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:16:46 2012 +0200 jscript: Use prototype for builtin Boolean properties. --- dlls/jscript/bool.c | 10 +++++++++- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 14bb1a3..d5dfcb4 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -117,6 +117,14 @@ static const builtin_info_t Bool_info = { NULL }; +static const builtin_info_t BoolInst_info = { + JSCLASS_BOOLEAN, + {NULL, Bool_value, 0}, + 0, NULL, + NULL, + NULL +}; + static HRESULT BoolConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) { @@ -168,7 +176,7 @@ static HRESULT alloc_bool(script_ctx_t *ctx, jsdisp_t *object_prototype, BoolIns if(object_prototype) hres = init_dispex(&bool->dispex, ctx, &Bool_info, object_prototype); else - hres = init_dispex_from_constr(&bool->dispex, ctx, &Bool_info, ctx->bool_constr); + hres = init_dispex_from_constr(&bool->dispex, ctx, &BoolInst_info, ctx->bool_constr); if(FAILED(hres)) { heap_free(bool); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4675e08..3d8d67a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -217,6 +217,11 @@ ok(Array.prototype.hasOwnProperty('length'), "Array.prototype.hasOwnProperty('le ok(!obj.hasOwnProperty('sort'), "obj.hasOwnProperty('sort') is true"); ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is true"); +obj = new Boolean(false); +ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); +ok(!Boolean.hasOwnProperty('toString'), "Boolean.hasOwnProperty('toString') is true"); +ok(Boolean.prototype.hasOwnProperty('toString'), "Boolean.prototype.hasOwnProperty('toString') is false"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 583ba527144cf59e319c22a0b52378112216815b URL: http://source.winehq.org/git/wine.git/?a=commit;h=583ba527144cf59e319c22a0b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 24 11:48:04 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 124 +++++++++++++++++++++--------------------- dlls/msvcp70/msvcp70.spec | 88 +++++++++++++++--------------- dlls/msvcp71/msvcp71.spec | 120 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 120 +++++++++++++++++++++--------------------- 4 files changed, 226 insertions(+), 226 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=583ba527144cf59e319c2…

1 0

Detlef Riekenberg : include: Add appcompatapi.h.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: d4db98dc54a89248c07e383f7462fd9b5b084fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4db98dc54a89248c07e383f7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jul 21 18:25:38 2012 +0200 include: Add appcompatapi.h. --- include/Makefile.in | 1 + include/appcompatapi.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 16a1e4f..742cbe1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -132,6 +132,7 @@ SRCDIR_INCLUDES = \ advpub.h \ af_irda.h \ amaudio.h \ + appcompatapi.h \ appmgmt.h \ asynot.idl \ asysta.idl \ diff --git a/include/appcompatapi.h b/include/appcompatapi.h new file mode 100644 index 0000000..90b184e --- /dev/null +++ b/include/appcompatapi.h @@ -0,0 +1,32 @@ +/* + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __APPCOMPAT_H +#define __APPCOMPAT_H + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL WINAPI ApphelpCheckShellObject(REFCLSID, BOOL, ULONGLONG *); + +#ifdef __cplusplus +} +#endif + +#endif /* __APPCOMPAT_H */

1 0

Detlef Riekenberg : apphelp: Implement ApphelpCheckShellObject.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: bb254fce23a473e3c1d4b560c788024f7bc258e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb254fce23a473e3c1d4b560c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jul 21 18:25:39 2012 +0200 apphelp: Implement ApphelpCheckShellObject. --- dlls/apphelp/apphelp.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 9394cf3..7ef1a41 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -19,6 +19,8 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include <appcompatapi.h> + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(apphelp); @@ -70,6 +72,7 @@ PDB WINAPI SdbCreateDatabase( LPCWSTR path, PATH_TYPE type ) BOOL WINAPI ApphelpCheckShellObject( REFCLSID clsid, BOOL shim, ULONGLONG *flags ) { - FIXME("stub: %s %p\n", debugstr_guid(clsid), flags ); + TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), shim, flags); + if (flags) *flags = 0; return TRUE; }

1 0