November 2013 - Wine-commits

André Hentschel : quartz: Add stubbed IVMRSurfaceAllocatorNotify interface.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: abbb40fa032535d317650576ea88d28811e7ae4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbb40fa032535d317650576e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 6 00:03:19 2013 +0100 quartz: Add stubbed IVMRSurfaceAllocatorNotify interface. --- dlls/quartz/vmr9.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index bd3e76d..eb0222a 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -57,6 +57,7 @@ struct quartz_vmr IVMRFilterConfig9 IVMRFilterConfig9_iface; IVMRWindowlessControl IVMRWindowlessControl_iface; IVMRWindowlessControl9 IVMRWindowlessControl9_iface; + IVMRSurfaceAllocatorNotify IVMRSurfaceAllocatorNotify_iface; IVMRSurfaceAllocatorNotify9 IVMRSurfaceAllocatorNotify9_iface; IVMRSurfaceAllocatorEx9 *allocator; @@ -142,6 +143,11 @@ static inline struct quartz_vmr *impl_from_IVMRWindowlessControl9(IVMRWindowless return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRWindowlessControl9_iface); } +static inline struct quartz_vmr *impl_from_IVMRSurfaceAllocatorNotify(IVMRSurfaceAllocatorNotify *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRSurfaceAllocatorNotify_iface); +} + static inline struct quartz_vmr *impl_from_IVMRSurfaceAllocatorNotify9(IVMRSurfaceAllocatorNotify9 *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRSurfaceAllocatorNotify9_iface); @@ -745,6 +751,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP *ppv = &This->IVMRWindowlessControl_iface; else if (IsEqualIID(riid, &IID_IVMRWindowlessControl9) && This->mode == VMR9Mode_Windowless) *ppv = &This->IVMRWindowlessControl9_iface; + else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorNotify) && This->mode == (VMR9Mode)VMRMode_Renderless) + *ppv = &This->IVMRSurfaceAllocatorNotify_iface; else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorNotify9) && This->mode == VMR9Mode_Renderless) *ppv = &This->IVMRSurfaceAllocatorNotify9_iface; else @@ -1745,6 +1753,92 @@ static const IVMRWindowlessControl9Vtbl VMR9_WindowlessControl_Vtbl = VMR9WindowlessControl_GetBorderColor }; +static HRESULT WINAPI VMR7SurfaceAllocatorNotify_QueryInterface(IVMRSurfaceAllocatorNotify *iface, + REFIID riid, LPVOID * ppv) +{ + struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify(iface); + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI VMR7SurfaceAllocatorNotify_AddRef(IVMRSurfaceAllocatorNotify *iface) +{ + struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify(iface); + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI VMR7SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotify *iface) +{ + struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify(iface); + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI VMR7SurfaceAllocatorNotify_AdviseSurfaceAllocator(IVMRSurfaceAllocatorNotify *iface, + DWORD_PTR id, + IVMRSurfaceAllocator *alloc) +{ + struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7SurfaceAllocatorNotify_SetDDrawDevice(IVMRSurfaceAllocatorNotify *iface, + IDirectDraw7 *device, HMONITOR monitor) +{ + struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7SurfaceAllocatorNotify_ChangeDDrawDevice(IVMRSurfaceAllocatorNotify *iface, + IDirectDraw7 *device, HMONITOR monitor) +{ + struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7SurfaceAllocatorNotify_RestoreDDrawSurfaces(IVMRSurfaceAllocatorNotify *iface) +{ + struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7SurfaceAllocatorNotify_NotifyEvent(IVMRSurfaceAllocatorNotify *iface, LONG code, + LONG_PTR param1, LONG_PTR param2) +{ + struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7SurfaceAllocatorNotify_SetBorderColor(IVMRSurfaceAllocatorNotify *iface, + COLORREF clrBorder) +{ + struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static const IVMRSurfaceAllocatorNotifyVtbl VMR7_SurfaceAllocatorNotify_Vtbl = +{ + VMR7SurfaceAllocatorNotify_QueryInterface, + VMR7SurfaceAllocatorNotify_AddRef, + VMR7SurfaceAllocatorNotify_Release, + VMR7SurfaceAllocatorNotify_AdviseSurfaceAllocator, + VMR7SurfaceAllocatorNotify_SetDDrawDevice, + VMR7SurfaceAllocatorNotify_ChangeDDrawDevice, + VMR7SurfaceAllocatorNotify_RestoreDDrawSurfaces, + VMR7SurfaceAllocatorNotify_NotifyEvent, + VMR7SurfaceAllocatorNotify_SetBorderColor +}; + static HRESULT WINAPI VMR9SurfaceAllocatorNotify_QueryInterface(IVMRSurfaceAllocatorNotify9 *iface, REFIID riid, LPVOID * ppv) { struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); @@ -1893,7 +1987,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_NotifyEvent(IVMRSurfaceAllocato return E_NOTIMPL; } -static const IVMRSurfaceAllocatorNotify9Vtbl IVMRSurfaceAllocatorNotify9_Vtbl = +static const IVMRSurfaceAllocatorNotify9Vtbl VMR9_SurfaceAllocatorNotify_Vtbl = { VMR9SurfaceAllocatorNotify_QueryInterface, VMR9SurfaceAllocatorNotify_AddRef, @@ -1941,7 +2035,8 @@ static HRESULT vmr_create(IUnknown *outer_unk, LPVOID *ppv, const CLSID *clsid) pVMR->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; pVMR->IVMRWindowlessControl_iface.lpVtbl = &VMR7_WindowlessControl_Vtbl; pVMR->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; - pVMR->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &IVMRSurfaceAllocatorNotify9_Vtbl; + pVMR->IVMRSurfaceAllocatorNotify_iface.lpVtbl = &VMR7_SurfaceAllocatorNotify_Vtbl; + pVMR->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &VMR9_SurfaceAllocatorNotify_Vtbl; if (IsEqualGUID(clsid, &CLSID_VideoMixingRenderer)) hr = BaseRenderer_Init(&pVMR->renderer, &VMR_Vtbl, outer_unk, &CLSID_VideoMixingRenderer,

1 0

André Hentschel : quartz: Add stubbed IVMRMonitorConfig interfaces.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: ab925b39b4eb2a9decca14ea0938e7af087949c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab925b39b4eb2a9decca14ea0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 6 00:05:13 2013 +0100 quartz: Add stubbed IVMRMonitorConfig interfaces. --- dlls/quartz/vmr9.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 177 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab925b39b4eb2a9decca1…

1 0

André Hentschel : quartz: Add stubbed IAMCertifiedOutputProtection interface.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 217faec5f59c5a83981c39698e94391a7bd3d766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=217faec5f59c5a83981c39698… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 6 00:06:41 2013 +0100 quartz: Add stubbed IAMCertifiedOutputProtection interface. --- dlls/quartz/vmr9.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 1e89225..2dc12a6 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -52,6 +52,7 @@ struct quartz_vmr BaseControlVideo baseControlVideo; IUnknown IUnknown_inner; + IAMCertifiedOutputProtection IAMCertifiedOutputProtection_iface; IAMFilterMiscFlags IAMFilterMiscFlags_iface; IVMRFilterConfig IVMRFilterConfig_iface; IVMRFilterConfig9 IVMRFilterConfig9_iface; @@ -120,6 +121,11 @@ static inline struct quartz_vmr *impl_from_IBasicVideo(IBasicVideo *iface) return CONTAINING_RECORD(iface, struct quartz_vmr, baseControlVideo.IBasicVideo_iface); } +static inline struct quartz_vmr *impl_from_IAMCertifiedOutputProtection(IAMCertifiedOutputProtection *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, IAMCertifiedOutputProtection_iface); +} + static inline struct quartz_vmr *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IAMFilterMiscFlags_iface); @@ -753,6 +759,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP *ppv = &This->baseControlWindow.IVideoWindow_iface; else if (IsEqualIID(riid, &IID_IBasicVideo)) *ppv = &This->baseControlVideo.IBasicVideo_iface; + else if (IsEqualIID(riid, &IID_IAMCertifiedOutputProtection)) + *ppv = &This->IAMCertifiedOutputProtection_iface; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) *ppv = &This->IAMFilterMiscFlags_iface; else if (IsEqualIID(riid, &IID_IVMRFilterConfig)) @@ -1086,6 +1094,74 @@ static const IBasicVideoVtbl IBasicVideo_VTable = BaseControlVideoImpl_IsUsingDefaultDestination }; +static HRESULT WINAPI AMCertifiedOutputProtection_QueryInterface(IAMCertifiedOutputProtection *iface, + REFIID riid, void **ppv) +{ + struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI AMCertifiedOutputProtection_AddRef(IAMCertifiedOutputProtection *iface) +{ + struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI AMCertifiedOutputProtection_Release(IAMCertifiedOutputProtection *iface) +{ + struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI AMCertifiedOutputProtection_KeyExchange(IAMCertifiedOutputProtection *iface, + GUID* pRandom, BYTE** VarLenCertGH, + DWORD* pdwLengthCertGH) +{ + struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); + + FIXME("(%p/%p)->(%p, %p, %p) stub\n", iface, This, pRandom, VarLenCertGH, pdwLengthCertGH); + return E_NOTIMPL; +} + +static HRESULT WINAPI AMCertifiedOutputProtection_SessionSequenceStart(IAMCertifiedOutputProtection *iface, + AMCOPPSignature* pSig) +{ + struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, pSig); + return E_NOTIMPL; +} + +static HRESULT WINAPI AMCertifiedOutputProtection_ProtectionCommand(IAMCertifiedOutputProtection *iface, + const AMCOPPCommand* cmd) +{ + struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, cmd); + return E_NOTIMPL; +} + +static HRESULT WINAPI AMCertifiedOutputProtection_ProtectionStatus(IAMCertifiedOutputProtection *iface, + const AMCOPPStatusInput* pStatusInput, + AMCOPPStatusOutput* pStatusOutput) +{ + struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); + + FIXME("(%p/%p)->(%p, %p) stub\n", iface, This, pStatusInput, pStatusOutput); + return E_NOTIMPL; +} + +static const IAMCertifiedOutputProtectionVtbl IAMCertifiedOutputProtection_Vtbl = +{ + AMCertifiedOutputProtection_QueryInterface, + AMCertifiedOutputProtection_AddRef, + AMCertifiedOutputProtection_Release, + AMCertifiedOutputProtection_KeyExchange, + AMCertifiedOutputProtection_SessionSequenceStart, + AMCertifiedOutputProtection_ProtectionCommand, + AMCertifiedOutputProtection_ProtectionStatus +}; + static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { struct quartz_vmr *This = impl_from_IAMFilterMiscFlags(iface); return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); @@ -2183,6 +2259,7 @@ static HRESULT vmr_create(IUnknown *outer_unk, LPVOID *ppv, const CLSID *clsid) pVMR->bUnkOuterValid = FALSE; pVMR->bAggregatable = FALSE; pVMR->IUnknown_inner.lpVtbl = &IInner_VTable; + pVMR->IAMCertifiedOutputProtection_iface.lpVtbl = &IAMCertifiedOutputProtection_Vtbl; pVMR->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; pVMR->mode = 0;

1 0

Dmitry Timoshkov : gdiplus/tests: Use trace instead of printf.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: d4db49efc2cb999375889e1a3c99b9e6f01a72d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4db49efc2cb999375889e1a3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 6 11:45:54 2013 +0900 gdiplus/tests: Use trace instead of printf. --- dlls/gdiplus/tests/image.c | 54 ++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 63d37cb..c4e61cc 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3223,10 +3223,10 @@ static void test_tiff_properties(void) { UINT j; BYTE *data = prop_item->value; - printf("id %#x:", prop_item->id); + trace("id %#x:", prop_item->id); for (j = 0; j < prop_item->length; j++) - printf(" %02x", data[j]); - printf("\n"); + trace(" %02x", data[j]); + trace("\n"); } } HeapFree(GetProcessHeap(), 0, prop_item); @@ -3329,10 +3329,10 @@ static void test_GdipGetAllPropertyItems(void) { UINT j; BYTE *data = prop_item->value; - printf("id %#x:", prop_item->id); + trace("id %#x:", prop_item->id); for (j = 0; j < prop_item->length; j++) - printf(" %02x", data[j]); - printf("\n"); + trace(" %02x", data[j]); + trace("\n"); } } HeapFree(GetProcessHeap(), 0, prop_item); @@ -3391,10 +3391,10 @@ static void test_GdipGetAllPropertyItems(void) { UINT j; BYTE *data = prop_item[i].value; - printf("id %#x:", prop_item[i].id); + trace("id %#x:", prop_item[i].id); for (j = 0; j < prop_item[i].length; j++) - printf(" %02x", data[j]); - printf("\n"); + trace(" %02x", data[j]); + trace("\n"); } } item_data += prop_item[i].length; @@ -3623,10 +3623,10 @@ static void test_bitmapbits(void) if (!match) { BYTE *bits = data.Scan0; - printf("%u: data mismatch for format %#x:", i, td[i].format); + trace("%u: data mismatch for format %#x:", i, td[i].format); for (j = 0; j < td[i].size; j++) - printf(" %02x", bits[j]); - printf("\n"); + trace(" %02x", bits[j]); + trace("\n"); } } else @@ -3654,10 +3654,10 @@ static void test_bitmapbits(void) { UINT j; BYTE *bits = data.Scan0; - printf("%u: data mismatch for format %#x:", i, td[i].format); + trace("%u: data mismatch for format %#x:", i, td[i].format); for (j = 0; j < 48; j++) - printf(" %02x", bits[j]); - printf("\n"); + trace(" %02x", bits[j]); + trace("\n"); } } @@ -3709,8 +3709,8 @@ static void test_DrawImage(void) UINT i, size = sizeof(white_2x2); BYTE *bits = white_2x2; for (i = 0; i < size; i++) - printf(" %02x", bits[i]); - printf("\n"); + trace(" %02x", bits[i]); + trace("\n"); } status = GdipDeleteGraphics(graphics); @@ -3761,8 +3761,8 @@ static void test_GdipDrawImagePointRect(void) UINT i, size = sizeof(white_2x2); BYTE *bits = white_2x2; for (i = 0; i < size; i++) - printf(" %02x", bits[i]); - printf("\n"); + trace(" %02x", bits[i]); + trace("\n"); } status = GdipDeleteGraphics(graphics); @@ -3968,8 +3968,8 @@ static void test_DrawImage_scale(void) UINT i, size = sizeof(dst_8x1); const BYTE *bits = dst_8x1; for (i = 0; i < size; i++) - printf(" %02x", bits[i]); - printf("\n"); + trace(" %02x", bits[i]); + trace("\n"); } } @@ -4094,10 +4094,10 @@ static void test_gif_properties(void) { UINT j; BYTE *data = prop_item->value; - printf("id %#x:", prop_item->id); + trace("id %#x:", prop_item->id); for (j = 0; j < prop_item->length; j++) - printf(" %02x", data[j]); - printf("\n"); + trace(" %02x", data[j]); + trace("\n"); } } HeapFree(GetProcessHeap(), 0, prop_item); @@ -4156,10 +4156,10 @@ static void test_gif_properties(void) { UINT j; BYTE *data = prop_item[i].value; - printf("id %#x:", prop_item[i].id); + trace("id %#x:", prop_item[i].id); for (j = 0; j < prop_item[i].length; j++) - printf(" %02x", data[j]); - printf("\n"); + trace(" %02x", data[j]); + trace("\n"); } } item_data += prop_item[i].length;

1 0

Dmitry Timoshkov : gdiplus/tests: Add more checks to the GdipGetPathData test.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 6278f5ffdc522047ba6c09aac79b2172c5661f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6278f5ffdc522047ba6c09aac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 6 11:45:59 2013 +0900 gdiplus/tests: Add more checks to the GdipGetPathData test. --- dlls/gdiplus/tests/graphicspath.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 6d929b0..6d4171c 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -156,15 +156,16 @@ static void test_getpathdata(void) GpStatus status; INT count; - GdipCreatePath(FillModeAlternate, &path); + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); status = GdipAddPathLine(path, 5.0, 5.0, 100.0, 50.0); expect(Ok, status); - /* Prepare storage. Made by wrapper class. */ status = GdipGetPointCount(path, &count); expect(Ok, status); + expect(2, count); - data.Count = 2; + data.Count = count; data.Types = GdipAlloc(sizeof(BYTE) * count); data.Points = GdipAlloc(sizeof(PointF) * count);

1 0

André Hentschel : Wine 1.7.4 freigegeben
by Jeremy Newman 05 Nov '13

05 Nov '13

Module: website Branch: master Commit: 90231d8cb4dd523b599aad794c6b9db96e96c8f3 URL: http://source.winehq.org/git/website.git/?a=commit;h=90231d8cb4dd523b599aad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 5 21:42:29 2013 +0100 Wine 1.7.4 freigegeben --- news/de/2013101101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2013101101.xml b/news/de/2013101101.xml new file mode 100644 index 0000000..c7a3e4b --- /dev/null +++ b/news/de/2013101101.xml @@ -0,0 +1,15 @@ +<news> +<date>11. Oktober 2013</date> +<title>Wine 1.7.4 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Cocoa-Artigen Vollbildmodus im Mac Treiber.</li> + <li>Mehr Vorarbeit für den Direct3D Befehlsstrom.</li> + <li>Mehrere Winsock Verbesserungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.4.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Andrey Zhezherun : msvcp: Fixed complex division.
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: 44bf8dc4295c12b954a166aa72811fee022e0135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44bf8dc4295c12b954a166aa7… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Mon Nov 4 09:41:25 2013 +0000 msvcp: Fixed complex division. --- dlls/msvcp71/math.c | 40 ++++++++++++++++++++++------------------ dlls/msvcp80/math.c | 40 ++++++++++++++++++++++------------------ dlls/msvcp90/math.c | 40 ++++++++++++++++++++++------------------ 3 files changed, 66 insertions(+), 54 deletions(-) diff --git a/dlls/msvcp71/math.c b/dlls/msvcp71/math.c index 69e4509..7d56c70 100644 --- a/dlls/msvcp71/math.c +++ b/dlls/msvcp71/math.c @@ -1087,6 +1087,7 @@ complex_float* __cdecl complex_float_add_cf(complex_float *ret, const complex_fl /* ??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z */ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float *l, const complex_float *r) { + float tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_float_quiet_NaN(); @@ -1094,15 +1095,16 @@ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabsf(r->real) >= fabsf(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } @@ -1705,6 +1707,7 @@ complex_double* __cdecl complex_double_add_cd(complex_double *ret, const complex /* ??$?KO(a)std@@YA?AV?$complex(a)O@0(a)AEBV10@0(a)Z */ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_double *l, const complex_double *r) { + double tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_double_quiet_NaN(); @@ -1712,15 +1715,16 @@ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_do return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabs(r->real) >= fabs(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } diff --git a/dlls/msvcp80/math.c b/dlls/msvcp80/math.c index 69e4509..7d56c70 100644 --- a/dlls/msvcp80/math.c +++ b/dlls/msvcp80/math.c @@ -1087,6 +1087,7 @@ complex_float* __cdecl complex_float_add_cf(complex_float *ret, const complex_fl /* ??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z */ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float *l, const complex_float *r) { + float tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_float_quiet_NaN(); @@ -1094,15 +1095,16 @@ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabsf(r->real) >= fabsf(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } @@ -1705,6 +1707,7 @@ complex_double* __cdecl complex_double_add_cd(complex_double *ret, const complex /* ??$?KO(a)std@@YA?AV?$complex(a)O@0(a)AEBV10@0(a)Z */ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_double *l, const complex_double *r) { + double tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_double_quiet_NaN(); @@ -1712,15 +1715,16 @@ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_do return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabs(r->real) >= fabs(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index e049d69..f804ac9 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1087,6 +1087,7 @@ complex_float* __cdecl complex_float_add_cf(complex_float *ret, const complex_fl /* ??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z */ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float *l, const complex_float *r) { + float tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_float_quiet_NaN(); @@ -1094,15 +1095,16 @@ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabsf(r->real) >= fabsf(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } @@ -1705,6 +1707,7 @@ complex_double* __cdecl complex_double_add_cd(complex_double *ret, const complex /* ??$?KO(a)std@@YA?AV?$complex(a)O@0(a)AEBV10@0(a)Z */ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_double *l, const complex_double *r) { + double tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_double_quiet_NaN(); @@ -1712,15 +1715,16 @@ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_do return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabs(r->real) >= fabs(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; }

1 0

Rico Schüller : opengl32: Use variables for file names .
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: 3c08b95b3ba2438c6984678cb7340eef2901df39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c08b95b3ba2438c6984678cb… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:05 2013 +0100 opengl32: Use variables for file names. --- dlls/opengl32/make_opengl | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index fedf2a6..9817f8c 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -65,6 +65,8 @@ use strict; my $spec_file = "opengl32.spec"; my $norm_file = "opengl_norm.c"; my $ext_file = "opengl_ext.c"; +my $wgl_driver_file = "../../include/wine/wgl_driver.h"; +my $wgl_file = "../../include/wine/wgl.h"; # Set to 0 for removing the ENTER / LEAVE GL calls my $gen_thread_safe = 0; @@ -776,7 +778,7 @@ parse_enum_file( "enumext.spec", \%enums ); # Get the current wgl_driver.h version # my $wgl_version = 0; -open HEADER, "<../../include/wine/wgl_driver.h" or die "cannot open wgl_driver.h"; +open HEADER, "<$wgl_driver_file" or die "cannot open $wgl_driver_file"; while (<HEADER>) { next unless /^#define WINE_WGL_DRIVER_VERSION (\d+)/; @@ -788,8 +790,8 @@ close HEADER; # # Generate the wgl_driver.h file # -open HEADER, ">../../include/wine/wgl_driver.h" or die "cannot create wgl_driver.h"; -print HEADER "/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */\n\n"; +open HEADER, ">$wgl_driver_file" or die "cannot create $wgl_driver_file"; +print HEADER "/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */\n\n"; print HEADER "#ifndef __WINE_WGL_DRIVER_H\n"; print HEADER "#define __WINE_WGL_DRIVER_H\n\n"; print HEADER "#ifndef WINE_GLAPI\n"; @@ -841,8 +843,8 @@ close HEADER; # # Generate the wgl.h file # -open HEADER, ">../../include/wine/wgl.h" or die "cannot create wgl.h"; -print HEADER "/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */\n\n"; +open HEADER, ">$wgl_file" or die "cannot create $wgl_file"; +print HEADER "/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */\n\n"; print HEADER "#ifndef __WINE_WGL_H\n"; print HEADER "#define __WINE_WGL_H\n\n";

1 0

Rico Schüller : opengl32: Fix some style issues.
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: 465673a3d6906d32119e546f568d07e47b6ff4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=465673a3d6906d32119e546f5… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:14 2013 +0100 opengl32: Fix some style issues. --- dlls/opengl32/make_opengl | 108 +++++++++++++++++++++----------------------- 1 files changed, 52 insertions(+), 56 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 9817f8c..18d5107 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -210,10 +210,9 @@ sub ConvertType($) ); foreach my $org (reverse sort keys %hash) { - if ($type =~ /$org/) { - my ($before, $after) = ($type =~ /^(.*)$org(.*)$/); - return "$before$hash{$org}$after"; - } + if ($type =~ /^(.*)$org(.*)$/) { + return "$1$hash{$org}$2"; + } } return $type; } @@ -229,10 +228,9 @@ sub ConvertVarName($) "far" => "farParam" ); foreach my $org (keys %hash) { - if ($type =~ /$org/) { - my ($before, $after) = ($type =~ /^(.*)$org(.*)$/); - return "$before$hash{$org}$after"; - } + if ($type =~ /^(.*)$org(.*)$/) { + return "$1$hash{$org}$2"; + } } return $type; } @@ -255,22 +253,20 @@ sub GenerateThunk($$$$) # If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-) # Patrik says: Well I would be even happier if a (OPENGL32.@) was added as well. Done. :-) if ($comment eq 1) { - $ret = "$ret/***********************************************************************\n"; - $ret = "$ret * $name (OPENGL32.\@)\n"; - $ret = "$ret */\n"; + $ret .= "/***********************************************************************\n"; + $ret .= " * $name (OPENGL32.\@)\n"; + $ret .= " */\n"; } - $ret = $ret . ConvertType($func_ref->[0]) . " WINAPI $name( "; + $ret .= ConvertType($func_ref->[0]) . " WINAPI $name( "; for (my $i = 0; $i < @{$func_ref->[1]}; $i++) { - ## Quick debug code :-) - ## print $func_ref->[1]->[$i]->[1] . "\n"; - my $type = $func_ref->[1]->[$i]->[0]; - my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); - $ret .= ConvertType($type) . " $name"; - $call_arg .= $name; - if ($type =~ /\*/) { - $trace_arg .= "%p"; + my $type = $func_ref->[1]->[$i]->[0]; + my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); + $ret .= ConvertType($type) . " $name"; + $call_arg .= $name; + if ($type =~ /\*/) { + $trace_arg .= "%p"; $trace_call_arg .= $name; - } elsif (defined $debug_conv{$type}) { + } elsif (defined $debug_conv{$type}) { if ($debug_conv{$type} =~ /(.*),(.*)/) { $trace_arg .= $1; @@ -281,40 +277,40 @@ sub GenerateThunk($$$$) $trace_arg .= $debug_conv{$type}; $trace_call_arg .= $name; } - } - else { printf "Unknown type %s\n", $type; } - if ($i+1 < @{$func_ref->[1]}) { - $ret .= ", "; - $call_arg .= ", "; - $trace_call_arg .= ", "; - $trace_arg .= ", "; - } else { - $ret .= " "; - $call_arg .= " "; - $trace_call_arg .= " "; - } + } + else { printf "Unknown type %s\n", $type; } + if ($i+1 < @{$func_ref->[1]}) { + $ret .= ", "; + $call_arg .= ", "; + $trace_call_arg .= ", "; + $trace_arg .= ", "; + } else { + $ret .= " "; + $call_arg .= " "; + $trace_call_arg .= " "; + } } $ret .= 'void ' if (!@{$func_ref->[1]}); $ret .= ") {\n"; $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; if ($func_ref->[0] ne "void" && $gen_thread_safe) { - $ret = "$ret " . ConvertType($func_ref->[0]) . " ret_value;\n"; + $ret .= " " . ConvertType($func_ref->[0]) . " ret_value;\n"; } if ($gen_traces) { - $ret = "$ret TRACE(\"($trace_arg)\\n\""; - if ($trace_arg ne "") { - $ret .= ", $trace_call_arg"; - } - $ret = "$ret);\n"; + $ret .= " TRACE(\"($trace_arg)\\n\""; + if ($trace_arg ne "") { + $ret .= ", $trace_call_arg"; + } + $ret .= ");\n"; } if ($gen_thread_safe) { - $ret .= " ENTER_GL();\n"; + $ret .= " ENTER_GL();\n"; $ret .= " "; if ($func_ref->[0] ne "void") { $ret .= "ret_value = "; } $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; - $ret .= " LEAVE_GL();\n"; + $ret .= " LEAVE_GL();\n"; if ($func_ref->[0] ne "void") { $ret .= " return ret_value;\n" } @@ -326,7 +322,7 @@ sub GenerateThunk($$$$) } $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; } - $ret = "$ret}\n"; + $ret .= "}\n"; # Return this string.... return $ret; @@ -341,10 +337,10 @@ sub generate_null_func($$) $ret = "static " . ConvertType($func_ref->[0]) . " null_$name( "; for (my $i = 0; $i < @{$func_ref->[1]}; $i++) { - my $type = $func_ref->[1]->[$i]->[0]; - my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); - $ret .= ConvertType($type) . " $name"; - $ret .= "," if ($i+1 < @{$func_ref->[1]}); + my $type = $func_ref->[1]->[$i]->[0]; + my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); + $ret .= ConvertType($type) . " $name"; + $ret .= "," if ($i+1 < @{$func_ref->[1]}); $ret .= " "; } $ret .= 'void ' if (!@{$func_ref->[1]}); @@ -368,7 +364,7 @@ sub get_func_proto($$$) $ret .= " " . sprintf($format,$name) . "("; for (my $i = 0; $i < @{$func->[1]}; $i++) { - $ret .= ConvertType($func->[1]->[$i]->[0]); + $ret .= ConvertType($func->[1]->[$i]->[0]); $ret .= "," if ($i+1 < @{$func->[1]}); } $ret .= "void" unless @{$func->[1]}; @@ -882,14 +878,14 @@ open(SPEC, ">$spec_file"); foreach (sort keys %norm_functions) { my $args=" "; for (my $i = 0; $i < @{$norm_functions{$_}->[1]}; $i++) { - my $type = $norm_functions{$_}->[1]->[$i]->[0]; - if ($type =~ /\*/) { - $args .= "ptr "; - } elsif (defined($arg_conv{$type})) { - $args .= "$@$arg_conv{$type}[0] "; - } else { - die "No conversion for GL type $type...\n"; - } + my $type = $norm_functions{$_}->[1]->[$i]->[0]; + if ($type =~ /\*/) { + $args .= "ptr "; + } elsif (defined($arg_conv{$type})) { + $args .= "$@$arg_conv{$type}[0] "; + } else { + die "No conversion for GL type $type...\n"; + } } $args = substr($args,1,-1); print SPEC "@ stdcall $_($args)\n"; @@ -1003,7 +999,7 @@ foreach (sort keys %ext_functions) { my $func_ref = $ext_functions{$_}; print EXT " { \"$_\", \"$func_ref->[2]\", $_ }"; if ($i != $count-1) { - print EXT ","; + print EXT ","; } $i++; print EXT "\n";

1 0

Rico Schüller : opengl32: Allow multiple extensions to support the same function.
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: 8a23fbf56fa9e0191fbcdfe942b9be18d74c6388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a23fbf56fa9e0191fbcdfe94… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:19 2013 +0100 opengl32: Allow multiple extensions to support the same function. This allows that gl functions are available for different extensions, e.g. "glVertexP2ui" which is new GL_ARB_vertex_type_2_10_10_10_rev and also in GL_VERSION_3_3. It is valid to get that function for each gl version when GL_ARB_vertex_type_2_10_10_10_rev is in the extension list. On the other hand that function is available, when the gl version is >= 3.3. --- dlls/opengl32/wgl.c | 53 +++++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 1a9b1b4..dc5282a 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -665,10 +665,8 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, } /* check if the extension is present in the list */ -static BOOL has_extension( const char *list, const char *ext ) +static BOOL has_extension( const char *list, const char *ext, size_t len ) { - size_t len = strlen( ext ); - while (list) { while (*list == ' ') list++; @@ -688,6 +686,7 @@ static BOOL is_extension_supported(const char* extension) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; const char *gl_ext_string = (const char*)glGetString(GL_EXTENSIONS); + size_t len; TRACE("Checking for extension '%s'\n", extension); @@ -702,30 +701,36 @@ static BOOL is_extension_supported(const char* extension) * require the function to return NULL when an extension isn't found. For this reason we check * if the OpenGL extension required for the function we are looking up is supported. */ - /* Check if the extension is part of the GL extension string to see if it is supported. */ - if (has_extension(gl_ext_string, extension)) - return TRUE; - - /* In general an OpenGL function starts as an ARB/EXT extension and at some stage - * it becomes part of the core OpenGL library and can be reached without the ARB/EXT - * suffix as well. In the extension table, these functions contain GL_VERSION_major_minor. - * Check if we are searching for a core GL function */ - if(strncmp(extension, "GL_VERSION_", 11) == 0) + while ((len = strcspn(extension, " ")) != 0) { - const GLubyte *gl_version = funcs->gl.p_glGetString(GL_VERSION); - const char *version = extension + 11; /* Move past 'GL_VERSION_' */ + /* Check if the extension is part of the GL extension string to see if it is supported. */ + if (has_extension(gl_ext_string, extension, len)) + return TRUE; - if(!gl_version) { - ERR("No OpenGL version found!\n"); - return FALSE; - } + /* In general an OpenGL function starts as an ARB/EXT extension and at some stage + * it becomes part of the core OpenGL library and can be reached without the ARB/EXT + * suffix as well. In the extension table, these functions contain GL_VERSION_major_minor. + * Check if we are searching for a core GL function */ + if(strncmp(extension, "GL_VERSION_", 11) == 0) + { + const GLubyte *gl_version = funcs->gl.p_glGetString(GL_VERSION); + const char *version = extension + 11; /* Move past 'GL_VERSION_' */ - /* Compare the major/minor version numbers of the native OpenGL library and what is required by the function. - * The gl_version string is guaranteed to have at least a major/minor and sometimes it has a release number as well. */ - if( (gl_version[0] >= version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { - return TRUE; + if(!gl_version) { + ERR("No OpenGL version found!\n"); + return FALSE; + } + + /* Compare the major/minor version numbers of the native OpenGL library and what is required by the function. + * The gl_version string is guaranteed to have at least a major/minor and sometimes it has a release number as well. */ + if( (gl_version[0] >= version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { + return TRUE; + } + WARN("The function requires OpenGL version '%c.%c' while your drivers only provide '%c.%c'\n", version[0], version[2], gl_version[0], gl_version[2]); } - WARN("The function requires OpenGL version '%c.%c' while your drivers only provide '%c.%c'\n", version[0], version[2], gl_version[0], gl_version[2]); + + if (extension[len] == ' ') len++; + extension += len; } return FALSE; @@ -1681,7 +1686,7 @@ static GLubyte *filter_extensions( const char *extensions ) if (!(end = strchr( extensions, ' ' ))) end = extensions + strlen( extensions ); memcpy( p, extensions, end - extensions ); p[end - extensions] = 0; - if (!has_extension( disabled, p )) + if (!has_extension( disabled, p , strlen( p ))) { TRACE("++ %s\n", p ); p += end - extensions;

1 0