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

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: adbcfacb8c8a0fb6e104bd57aac93f2dd09f3372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbcfacb8c8a0fb6e104bd57a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:05:18 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts. --- dlls/windowscodecs/converter.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6ee3a16..8611560 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -852,7 +852,7 @@ static HRESULT WINAPI FormatConverter_QueryInterface(IWICFormatConverter *iface, IsEqualIID(&IID_IWICBitmapSource, iid) || IsEqualIID(&IID_IWICFormatConverter, iid)) { - *ppv = This; + *ppv = &This->IWICFormatConverter_iface; } else { @@ -1103,8 +1103,8 @@ HRESULT FormatConverter_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** p InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FormatConverter.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICFormatConverter_QueryInterface(&This->IWICFormatConverter_iface, iid, ppv); + IWICFormatConverter_Release(&This->IWICFormatConverter_iface); return ret; }

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: f97bc0fa2dea08c1ad99a0b2635f58aa0a44c813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97bc0fa2dea08c1ad99a0b26… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:06:15 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object. --- dlls/windowscodecs/fliprotate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index ee2a9c2..3449679 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -60,7 +60,7 @@ static HRESULT WINAPI FlipRotator_QueryInterface(IWICBitmapFlipRotator *iface, R IsEqualIID(&IID_IWICBitmapSource, iid) || IsEqualIID(&IID_IWICBitmapFlipRotator, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapFlipRotator_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: 19479795d91039464b33310847a7287396820e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=19479795d91039464b3331084… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:07:15 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts. --- dlls/windowscodecs/gifformat.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 866f006..17de9aa 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -72,7 +72,7 @@ static HRESULT WINAPI GifFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface IsEqualIID(&IID_IWICBitmapSource, iid) || IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapFrameDecode_iface; } else { @@ -299,9 +299,10 @@ static HRESULT WINAPI GifDecoder_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 { @@ -507,7 +508,7 @@ static HRESULT WINAPI GifDecoder_GetFrame(IWICBitmapDecoder *iface, IWICBitmapDecoder_AddRef(iface); result->parent = This; - *ppIBitmapFrame = (IWICBitmapFrameDecode*)result; + *ppIBitmapFrame = &result->IWICBitmapFrameDecode_iface; return S_OK; } @@ -550,8 +551,8 @@ HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": GifDecoder.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); + IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); return ret; }

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: 6859a15b076d536e11ffe78e5f2a456953f1eb62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6859a15b076d536e11ffe78e5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:10:15 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts. --- dlls/windowscodecs/imgfactory.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index c9bba2b..ea6df28 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -58,7 +58,7 @@ static HRESULT WINAPI ComponentFactory_QueryInterface(IWICComponentFactory *ifac IsEqualIID(&IID_IWICImagingFactory, iid) || IsEqualIID(&IID_IWICComponentFactory, iid)) { - *ppv = This; + *ppv = &This->IWICComponentFactory_iface; } else { @@ -650,8 +650,8 @@ HRESULT ComponentFactory_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** This->IWICComponentFactory_iface.lpVtbl = &ComponentFactory_Vtbl; This->ref = 1; - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICComponentFactory_QueryInterface(&This->IWICComponentFactory_iface, iid, ppv); + IWICComponentFactory_Release(&This->IWICComponentFactory_iface); return ret; }

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: b7efa00817ef7756ef22b8985756b58eb527f808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7efa00817ef7756ef22b8985… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:11:15 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts. --- dlls/windowscodecs/info.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 9531198..3c67eb7 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1842,9 +1842,10 @@ static HRESULT WINAPI ComponentEnum_QueryInterface(IEnumUnknown *iface, REFIID i if (!ppv) return E_INVALIDARG; - if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IEnumUnknown, iid)) + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IEnumUnknown, iid)) { - *ppv = This; + *ppv = &This->IEnumUnknown_iface; } else { @@ -1996,11 +1997,11 @@ static HRESULT WINAPI ComponentEnum_Clone(IEnumUnknown *iface, IEnumUnknown **pp if (FAILED(ret)) { - IUnknown_Release((IUnknown*)new_enum); + IEnumUnknown_Release(&new_enum->IEnumUnknown_iface); *ppenum = NULL; } else - *ppenum = (IEnumUnknown*)new_enum; + *ppenum = &new_enum->IEnumUnknown_iface; return ret; } @@ -2091,13 +2092,13 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn if (SUCCEEDED(hr)) { - IEnumUnknown_Reset((IEnumUnknown*)This); - *ppIEnumUnknown = (IEnumUnknown*)This; + IEnumUnknown_Reset(&This->IEnumUnknown_iface); + *ppIEnumUnknown = &This->IEnumUnknown_iface; } else { *ppIEnumUnknown = NULL; - IUnknown_Release((IUnknown*)This); + IEnumUnknown_Release(&This->IEnumUnknown_iface); } return hr;

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: f8d2c922b0e8029f6b88da41d5af0642e685e816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d2c922b0e8029f6b88da41d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:12:17 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts. --- dlls/windowscodecs/jpegformat.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 53d7ec4..2c77d4f 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -175,9 +175,10 @@ static HRESULT WINAPI JpegDecoder_QueryInterface(IWICBitmapDecoder *iface, REFII 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 { @@ -469,6 +470,8 @@ static const IWICBitmapDecoderVtbl JpegDecoder_Vtbl = { static HRESULT WINAPI JpegDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, void **ppv) { + JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -477,7 +480,7 @@ static HRESULT WINAPI JpegDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *if IsEqualIID(&IID_IWICBitmapSource, iid) || IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) { - *ppv = iface; + *ppv = &This->IWICBitmapFrameDecode_iface; } else { @@ -492,13 +495,13 @@ static HRESULT WINAPI JpegDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *if static ULONG WINAPI JpegDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) { JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IUnknown_AddRef((IUnknown*)This); + return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); } static ULONG WINAPI JpegDecoder_Frame_Release(IWICBitmapFrameDecode *iface) { JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - return IUnknown_Release((IUnknown*)This); + return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); } static HRESULT WINAPI JpegDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, @@ -722,8 +725,8 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegDecoder.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); + IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); return ret; } @@ -1219,7 +1222,7 @@ static HRESULT WINAPI JpegEncoder_QueryInterface(IWICBitmapEncoder *iface, REFII if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapEncoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapEncoder_iface; } else { @@ -1470,8 +1473,8 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); + IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); return ret; }

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: 6588aea643832291187391a713b4e95b67fdef42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6588aea643832291187391a71… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:13:15 2012 +0900 windowscodecs: Do not assume that vtable is the first element of the object. --- dlls/windowscodecs/palette.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 096258a..f989c97 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -611,7 +611,7 @@ HRESULT PaletteImpl_Create(IWICPalette **palette) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PaletteImpl.lock"); - *palette = (IWICPalette*)This; + *palette = &This->IWICPalette_iface; return S_OK; }

1 0

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

24 Jul '12

Module: wine Branch: master Commit: 1dfb75d9a38a4c14f74fff3d8eb1ad40cb37b140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dfb75d9a38a4c14f74fff3d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:17:32 2012 +0200 jscript: Use prototype for builtin RegExp properties. --- dlls/jscript/regexp.c | 19 ++++++++++++++++++- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 996f9f0..718a720 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3807,6 +3807,23 @@ static const builtin_info_t RegExp_info = { NULL }; +static const builtin_prop_t RegExpInst_props[] = { + {globalW, RegExp_global, 0}, + {ignoreCaseW, RegExp_ignoreCase, 0}, + {lastIndexW, RegExp_lastIndex, 0}, + {multilineW, RegExp_multiline, 0}, + {sourceW, RegExp_source, 0} +}; + +static const builtin_info_t RegExpInst_info = { + JSCLASS_REGEXP, + {NULL, RegExp_value, 0}, + sizeof(RegExpInst_props)/sizeof(*RegExpInst_props), + RegExpInst_props, + RegExp_destructor, + NULL +}; + static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegExpInstance **ret) { RegExpInstance *regexp; @@ -3819,7 +3836,7 @@ static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegEx if(object_prototype) hres = init_dispex(&regexp->dispex, ctx, &RegExp_info, object_prototype); else - hres = init_dispex_from_constr(&regexp->dispex, ctx, &RegExp_info, ctx->regexp_constr); + hres = init_dispex_from_constr(&regexp->dispex, ctx, &RegExpInst_info, ctx->regexp_constr); if(FAILED(hres)) { heap_free(regexp); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index fc787a9..9bc083d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -232,6 +232,13 @@ 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"); +obj = /x/; +ok(!obj.hasOwnProperty('exec'), "obj.hasOwnProperty('exec') is true"); +ok(obj.hasOwnProperty('source'), "obj.hasOwnProperty('source') is false"); +ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true"); +ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); +ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') 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 String properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 1104663fe78d5e324a55f1b2b88927cb57294f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1104663fe78d5e324a55f1b2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:17:41 2012 +0200 jscript: Use prototype for builtin String properties. --- dlls/jscript/string.c | 15 ++++++++++++++- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 9b23005..4921f8b 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1536,6 +1536,19 @@ static const builtin_info_t String_info = { NULL }; +static const builtin_prop_t StringInst_props[] = { + {lengthW, String_length, 0} +}; + +static const builtin_info_t StringInst_info = { + JSCLASS_STRING, + {NULL, String_value, 0}, + sizeof(StringInst_props)/sizeof(*StringInst_props), + StringInst_props, + String_destructor, + NULL +}; + /* ECMA-262 3rd Edition 15.5.3.2 */ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) @@ -1635,7 +1648,7 @@ static HRESULT string_alloc(script_ctx_t *ctx, jsdisp_t *object_prototype, Strin if(object_prototype) hres = init_dispex(&string->dispex, ctx, &String_info, object_prototype); else - hres = init_dispex_from_constr(&string->dispex, ctx, &String_info, ctx->string_constr); + hres = init_dispex_from_constr(&string->dispex, ctx, &StringInst_info, ctx->string_constr); if(FAILED(hres)) { heap_free(string); return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 9bc083d..c998fa6 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -239,6 +239,13 @@ ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true"); ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false"); +obj = new String(); +ok(!obj.hasOwnProperty('charAt'), "obj.hasOwnProperty('charAt') is true"); +ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is false"); +ok(!String.hasOwnProperty('charAt'), "String.hasOwnProperty('charAt') is true"); +ok(String.prototype.hasOwnProperty('charAt'), "String.prototype.hasOwnProperty('charAt') is false"); +ok(String.prototype.hasOwnProperty('length'), "String.prototype.hasOwnProperty('length') is false"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Alexandre Julliard : winex11: Add a helper function to correctly check extension strings.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: f3e1e46c85c036ca212f1e34a247c7be80934107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e1e46c85c036ca212f1e34a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 24 17:37:39 2012 +0200 winex11: Add a helper function to correctly check extension strings. --- dlls/winex11.drv/opengl.c | 56 ++++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e958132..22c608e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -209,7 +209,6 @@ static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; static void X11DRV_WineGL_LoadExtensions(void); static WineGLPixelFormat* ConvertPixelFormatWGLtoGLX(Display *display, int iPixelFormat, BOOL AllowOffscreen, int *fmt_count); static BOOL glxRequireVersion(int requiredVersion); -static BOOL glxRequireExtension(const char *requiredExtension); static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { TRACE(" - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion); @@ -320,6 +319,20 @@ static void (*pglFlush)(void); static void wglFinish(void); static void wglFlush(void); +/* check if the extension is present in the list */ +static BOOL has_extension( const char *list, const char *ext ) +{ + size_t len = strlen( ext ); + + while (list) + { + while (*list == ' ') list++; + if (!strncmp( list, ext, len ) && (!list[len] || list[len] == ' ')) return TRUE; + list = strchr( list, ' ' ); + } + return FALSE; +} + static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg) { /* In the future we might want to find the exact X or GLX error to report back to the app */ @@ -590,7 +603,7 @@ static BOOL has_opengl(void) pglXGetFBConfigAttrib = pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttrib"); pglXGetVisualFromFBConfig = pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfig"); pglXQueryDrawable = pglXGetProcAddressARB((const GLubyte *) "glXQueryDrawable"); - } else if(glxRequireExtension("GLX_SGIX_fbconfig")) { + } else if (has_extension( WineGLInfo.glxExtensions, "GLX_SGIX_fbconfig")) { pglXChooseFBConfig = pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfigSGIX"); pglXGetFBConfigAttrib = pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttribSGIX"); pglXGetVisualFromFBConfig = pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfigSGIX"); @@ -615,7 +628,7 @@ static BOOL has_opengl(void) ERR(" glx_version is %s and GLX_SGIX_fbconfig extension is unsupported. Expect problems.\n", WineGLInfo.glxServerVersion); } - if(glxRequireExtension("GLX_MESA_copy_sub_buffer")) { + if (has_extension( WineGLInfo.glxExtensions, "GLX_MESA_copy_sub_buffer")) { pglXCopySubBufferMESA = pglXGetProcAddressARB((const GLubyte *) "glXCopySubBufferMESA"); } @@ -854,7 +867,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ TRACE("pAttr[?] = GLX_RENDER_TYPE: %#x\n", pixelattrib); /* Set GLX_FLOAT_COMPONENTS_NV all the time */ - if(strstr(WineGLInfo.glxExtensions, "GLX_NV_float_buffer")) { + if (has_extension(WineGLInfo.glxExtensions, "GLX_NV_float_buffer")) { PUSH2(oGLXAttr, GLX_FLOAT_COMPONENTS_NV, nvfloatattrib); TRACE("pAttr[?] = GLX_FLOAT_COMPONENTS_NV: %#x\n", nvfloatattrib); } @@ -2860,15 +2873,6 @@ static BOOL glxRequireVersion(int requiredVersion) return FALSE; } -static BOOL glxRequireExtension(const char *requiredExtension) -{ - if (strstr(WineGLInfo.glxExtensions, requiredExtension) == NULL) { - return FALSE; - } - - return TRUE; -} - static void register_extension(const char *ext) { if (WineGLInfo.wglExtensions[0]) @@ -2887,16 +2891,16 @@ static void X11DRV_WineGL_LoadExtensions(void) /* ARB Extensions */ - if(glxRequireExtension("GLX_ARB_create_context")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context")) { register_extension( "WGL_ARB_create_context" ); opengl_funcs.ext.p_wglCreateContextAttribsARB = X11DRV_wglCreateContextAttribsARB; - if(glxRequireExtension("GLX_ARB_create_context_profile")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_profile")) register_extension("WGL_ARB_create_context_profile"); } - if(glxRequireExtension("GLX_ARB_fbconfig_float")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_fbconfig_float")) { register_extension("WGL_ARB_pixel_format_float"); register_extension("WGL_ATI_pixel_format_float"); @@ -2912,12 +2916,12 @@ static void X11DRV_WineGL_LoadExtensions(void) opengl_funcs.ext.p_wglMakeContextCurrentARB = X11DRV_wglMakeContextCurrentARB; } - if (glxRequireExtension("GLX_ARB_multisample")) register_extension( "WGL_ARB_multisample" ); + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_multisample")) register_extension( "WGL_ARB_multisample" ); /* In general pbuffer functionality requires support in the X-server. The functionality is * available either when the GLX_SGIX_pbuffer is present or when the GLX server version is 1.3. */ - if ( glxRequireVersion(3) && glxRequireExtension("GLX_SGIX_pbuffer") ) + if ( glxRequireVersion(3) && has_extension( WineGLInfo.glxExtensions, "GLX_SGIX_pbuffer") ) { register_extension( "WGL_ARB_pbuffer" ); opengl_funcs.ext.p_wglCreatePbufferARB = X11DRV_wglCreatePbufferARB; @@ -2934,19 +2938,19 @@ static void X11DRV_WineGL_LoadExtensions(void) opengl_funcs.ext.p_wglGetPixelFormatAttribivARB = X11DRV_wglGetPixelFormatAttribivARB; /* Support WGL_ARB_render_texture when there's support or pbuffer based emulation */ - if (glxRequireExtension("GLX_ARB_render_texture") || - (glxRequireVersion(3) && glxRequireExtension("GLX_SGIX_pbuffer") && use_render_texture_emulation)) + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_render_texture") || + (glxRequireVersion(3) && has_extension( WineGLInfo.glxExtensions, "GLX_SGIX_pbuffer") && use_render_texture_emulation)) { register_extension( "WGL_ARB_render_texture" ); opengl_funcs.ext.p_wglBindTexImageARB = X11DRV_wglBindTexImageARB; opengl_funcs.ext.p_wglReleaseTexImageARB = X11DRV_wglReleaseTexImageARB; /* The WGL version of GLX_NV_float_buffer requires render_texture */ - if(glxRequireExtension("GLX_NV_float_buffer")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_NV_float_buffer")) register_extension("WGL_NV_float_buffer"); /* Again there's no GLX equivalent for this extension, so depend on the required GL extension */ - if(strstr(WineGLInfo.glExtensions, "GL_NV_texture_rectangle") != NULL) + if (has_extension(WineGLInfo.glExtensions, "GL_NV_texture_rectangle")) register_extension("WGL_NV_texture_rectangle"); } @@ -2961,17 +2965,17 @@ static void X11DRV_WineGL_LoadExtensions(void) opengl_funcs.ext.p_wglSwapIntervalEXT = X11DRV_wglSwapIntervalEXT; opengl_funcs.ext.p_wglGetSwapIntervalEXT = X11DRV_wglGetSwapIntervalEXT; - if(glxRequireExtension("GLX_EXT_framebuffer_sRGB")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_EXT_framebuffer_sRGB")) register_extension("WGL_EXT_framebuffer_sRGB"); - if(glxRequireExtension("GLX_EXT_fbconfig_packed_float")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_EXT_fbconfig_packed_float")) register_extension("WGL_EXT_pixel_format_packed_float"); - if (glxRequireExtension("GLX_EXT_swap_control")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_EXT_swap_control")) has_swap_control = TRUE; /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */ - if(strstr(WineGLInfo.glExtensions, "GL_NV_vertex_array_range") != NULL) + if (has_extension(WineGLInfo.glExtensions, "GL_NV_vertex_array_range")) { register_extension( "WGL_NV_vertex_array_range" ); opengl_funcs.ext.p_wglAllocateMemoryNV = pglXAllocateMemoryNV;

1 0