September 2009 - Wine-commits

Alexandre Julliard : oleaut32: Use the appropriate PSFactoryBuffer guid when registering interfaces.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: 9cb140c43dc1eeb2b3d7a2fbf479e98ca09520f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb140c43dc1eeb2b3d7a2fbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 14:32:01 2009 +0200 oleaut32: Use the appropriate PSFactoryBuffer guid when registering interfaces. --- dlls/oleaut32/Makefile.in | 3 +- dlls/oleaut32/oleaut.c | 16 ++++++++------ dlls/oleaut32/regsvr.c | 51 +++----------------------------------------- 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 7e90511..a8ab7b4 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -7,7 +7,8 @@ IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = comctl32 urlmon windowscodecs EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H \ - -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_CLSID=CLSID_PSDispatch -DPROXY_DELEGATION -DREGISTER_PROXY_DLL + -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL \ + -DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}" C_SRCS = \ connpt.c \ diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 0eaddb1..896d6d4 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -696,6 +696,7 @@ HRESULT WINAPI OleTranslateColor( extern HRESULT WINAPI OLEAUTPS_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; extern BOOL WINAPI OLEAUTPS_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; +extern GUID const CLSID_PSFactoryBuffer DECLSPEC_HIDDEN; extern void _get_STDFONT_CF(LPVOID *); extern void _get_STDPIC_CF(LPVOID *); @@ -728,7 +729,7 @@ static HRESULT WINAPI PSDispatchFacBuf_CreateProxy(IPSFactoryBuffer *iface, IUnk HRESULT hr; if (IsEqualIID(riid, &IID_IDispatch)) - hr = OLEAUTPS_DllGetClassObject(&CLSID_PSDispatch, &IID_IPSFactoryBuffer, (void **)&pPSFB); + hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&pPSFB); else hr = TMARSHAL_DllGetClassObject(&CLSID_PSOAInterface, &IID_IPSFactoryBuffer, (void **)&pPSFB); @@ -746,7 +747,7 @@ static HRESULT WINAPI PSDispatchFacBuf_CreateStub(IPSFactoryBuffer *iface, REFII HRESULT hr; if (IsEqualIID(riid, &IID_IDispatch)) - hr = OLEAUTPS_DllGetClassObject(&CLSID_PSDispatch, &IID_IPSFactoryBuffer, (void **)&pPSFB); + hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&pPSFB); else hr = TMARSHAL_DllGetClassObject(&CLSID_PSOAInterface, &IID_IPSFactoryBuffer, (void **)&pPSFB); @@ -790,11 +791,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return S_OK; } } - if (IsEqualCLSID(rclsid, &CLSID_PSTypeInfo) || - IsEqualCLSID(rclsid, &CLSID_PSTypeLib) || - IsEqualCLSID(rclsid, &CLSID_PSEnumVariant)) { - return OLEAUTPS_DllGetClassObject(&CLSID_PSDispatch, iid, ppv); - } if (IsEqualCLSID(rclsid, &CLSID_PSDispatch) && IsEqualIID(iid, &IID_IPSFactoryBuffer)) { *ppv = &pPSDispatchFacBuf; IPSFactoryBuffer_AddRef((IPSFactoryBuffer *)*ppv); @@ -805,6 +801,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return S_OK; /*FALLTHROUGH*/ } + if (IsEqualCLSID(rclsid, &CLSID_PSTypeInfo) || + IsEqualCLSID(rclsid, &CLSID_PSTypeLib) || + IsEqualCLSID(rclsid, &CLSID_PSDispatch) || + IsEqualCLSID(rclsid, &CLSID_PSEnumVariant)) + return OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, iid, ppv); + return OLEAUTPS_DllGetClassObject(rclsid, iid, ppv); } diff --git a/dlls/oleaut32/regsvr.c b/dlls/oleaut32/regsvr.c index 75deac7..12f64fa 100644 --- a/dlls/oleaut32/regsvr.c +++ b/dlls/oleaut32/regsvr.c @@ -413,9 +413,6 @@ static GUID const CLSID_RecordInfo = { static GUID const CLSID_OldFont = { 0x46763EE0, 0xCAB2, 0x11CE, {0x8C,0x20,0x00,0xAA,0x00,0x51,0xE5,0xD4} }; -static GUID const CLSID_PSFactoryBuffer = { - 0xB196B286, 0xBAB4, 0x101A, {0xB6,0x9C,0x00,0xAA,0x00,0x34,0x1D,0x07} }; - static struct regsvr_coclass const coclass_list[] = { { &CLSID_RecordInfo, "CLSID_RecordInfo", @@ -483,12 +480,6 @@ static struct regsvr_coclass const coclass_list[] = { "Obsolete Font", "OldFont" }, - { &CLSID_PSFactoryBuffer, - "PSFactoryBuffer", - NULL, - "oleaut32.dll", - "Both" - }, { NULL } /* list terminator */ }; @@ -497,7 +488,6 @@ static struct regsvr_coclass const coclass_list[] = { */ #define INTERFACE_ENTRY(interface, clsid16, clsid32) { &IID_##interface, #interface, NULL, sizeof(interface##Vtbl)/sizeof(void*), clsid16, clsid32 } #define LCL_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, NULL) -#define PSFAC_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, &CLSID_PSFactoryBuffer) #define CLSID_INTERFACE_ENTRY(interface,clsid) INTERFACE_ENTRY(interface, clsid, clsid) static struct regsvr_interface const interface_list[] = { @@ -508,43 +498,10 @@ static struct regsvr_interface const interface_list[] = { CLSID_INTERFACE_ENTRY(ITypeComp,&CLSID_PSTypeComp), CLSID_INTERFACE_ENTRY(ITypeInfo,&CLSID_PSTypeInfo), CLSID_INTERFACE_ENTRY(ITypeLib,&CLSID_PSTypeLib), - PSFAC_INTERFACE_ENTRY(IAdviseSinkEx), - PSFAC_INTERFACE_ENTRY(IClassFactory2), - PSFAC_INTERFACE_ENTRY(IConnectionPoint), - PSFAC_INTERFACE_ENTRY(IConnectionPointContainer), - PSFAC_INTERFACE_ENTRY(ICreateErrorInfo), - PSFAC_INTERFACE_ENTRY(IEnumConnectionPoints), - PSFAC_INTERFACE_ENTRY(IEnumConnections), - PSFAC_INTERFACE_ENTRY(IEnumOleUndoUnits), - PSFAC_INTERFACE_ENTRY(IErrorInfo), - PSFAC_INTERFACE_ENTRY(IErrorLog), - PSFAC_INTERFACE_ENTRY(IFont), - PSFAC_INTERFACE_ENTRY(IObjectWithSite), - PSFAC_INTERFACE_ENTRY(IOleControl), - PSFAC_INTERFACE_ENTRY(IOleControlSite), - PSFAC_INTERFACE_ENTRY(IOleInPlaceSiteEx), - PSFAC_INTERFACE_ENTRY(IOleParentUndoUnit), - PSFAC_INTERFACE_ENTRY(IOleUndoManager), - PSFAC_INTERFACE_ENTRY(IOleUndoUnit), - PSFAC_INTERFACE_ENTRY(IPerPropertyBrowsing), - PSFAC_INTERFACE_ENTRY(IPersistMemory), - PSFAC_INTERFACE_ENTRY(IPersistPropertyBag), - PSFAC_INTERFACE_ENTRY(IPersistPropertyBag2), - PSFAC_INTERFACE_ENTRY(IPersistStreamInit), - PSFAC_INTERFACE_ENTRY(IPicture), - PSFAC_INTERFACE_ENTRY(IPointerInactive), - PSFAC_INTERFACE_ENTRY(IPropertyBag), - PSFAC_INTERFACE_ENTRY(IPropertyBag2), - PSFAC_INTERFACE_ENTRY(IPropertyNotifySink), - PSFAC_INTERFACE_ENTRY(IPropertyPage), - PSFAC_INTERFACE_ENTRY(IPropertyPage2), - PSFAC_INTERFACE_ENTRY(IPropertyPageSite), - PSFAC_INTERFACE_ENTRY(IProvideClassInfo), - PSFAC_INTERFACE_ENTRY(IProvideClassInfo2), - PSFAC_INTERFACE_ENTRY(IProvideMultipleClassInfo), - PSFAC_INTERFACE_ENTRY(IQuickActivate), - PSFAC_INTERFACE_ENTRY(ISimpleFrameSite), - PSFAC_INTERFACE_ENTRY(ISpecifyPropertyPages), + INTERFACE_ENTRY(ISupportErrorInfo,NULL,&CLSID_PSDispatch), + INTERFACE_ENTRY(ITypeFactory,NULL,&CLSID_PSDispatch), + INTERFACE_ENTRY(ITypeInfo2,NULL,&CLSID_PSDispatch), + INTERFACE_ENTRY(ITypeLib2,NULL,&CLSID_PSDispatch), { NULL } /* list terminator */ };

1 0

Alexandre Julliard : ntdll: Remap EXCEPTION_EXECUTE_FAULT only after the internal handlers have been run .
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: 9585bf6700be3af3228ebd5be7564fc28b9113be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9585bf6700be3af3228ebd5be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 14:20:17 2009 +0200 ntdll: Remap EXCEPTION_EXECUTE_FAULT only after the internal handlers have been run. --- dlls/ntdll/signal_i386.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f70448a..e426388 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1657,6 +1657,15 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] ))) goto done; + /* send EXCEPTION_EXECUTE_FAULT only if data execution prevention is enabled */ + if (rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) + { + ULONG flags; + NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, + &flags, sizeof(flags), NULL ); + if (!(flags & MEM_EXECUTE_OPTION_DISABLE)) + rec->ExceptionInformation[0] = EXCEPTION_READ_FAULT; + } } break; case EXCEPTION_DATATYPE_MISALIGNMENT: @@ -1833,15 +1842,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; rec->ExceptionInformation[0] = (get_error_code(context) >> 1) & 0x09; - /* Send code 8 (EXCEPTION_EXECUTE_FAULT) only if data execution - prevention is enabled */ - if (rec->ExceptionInformation[0] & 8) - { - ULONG flags; - NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, - &flags, sizeof(flags), NULL ); - if (!(flags & MEM_EXECUTE_OPTION_DISABLE)) rec->ExceptionInformation[0] &= 1; - } rec->ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */

1 0

Stefan Dösinger : wined3d: Fix sRGB-> RGB copy condition.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: 4fe014cb54c88118616cc4ba83da329f3b9a2575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe014cb54c88118616cc4ba8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 7 11:37:38 2009 +0200 wined3d: Fix sRGB->RGB copy condition. The old condition happened to work, because SFLAG_INTEXTURE was not set(we're loading it), and neither was SFLAG_INDRAWABLE(otherwise INTEXTURE would be set too). If the fbo INDRAWABLE == INTEXTURE is replaced by INDRAWABLE == INSRGBTEX this doesn't hold true any longer because SFLAG_INDRAWABLE is set, but not used because the drawable readback is never used for fbos. --- dlls/wined3d/surface.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7221ef0..53b969a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4851,12 +4851,18 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect); } } else { - if((This->Flags & SFLAG_LOCATIONS) == SFLAG_INSRGBTEX) { + if((This->Flags & (SFLAG_INSRGBTEX | SFLAG_INSYSMEM)) == SFLAG_INSRGBTEX) { /* Performance warning ... */ FIXME("%p: Downloading srgb texture to reload it as rgb\n", This); IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect); } } + if(!(This->Flags & SFLAG_INSYSMEM)) { + /* Should not happen */ + ERR("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set\n"); + /* Lets hope we get it from somewhere... */ + IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect); + } if (!device->isInDraw) ActivateContext(device, NULL, CTXUSAGE_RESOURCELOAD); surface_bind_and_dirtify(This, srgb);

1 0

Stefan Dösinger : wined3d: Don' t mark SFLAG_INTEXTURE up to date with fbo stretchrect.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: 33ca3c02076082131c0b846dd37f5d924f8d9b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ca3c02076082131c0b846dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 5 22:32:51 2009 +0200 wined3d: Don't mark SFLAG_INTEXTURE up to date with fbo stretchrect. FBO stretchrect marks SFLAG_INDRAWABLE up to date, which currently also marks SFLAG_INTEXTURE up to date. However, this will change when we enable rendering to the srgb copy, in which case the drawable could be equal to the srgb copy, not the rgb copy. --- dlls/wined3d/surface.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4e4ac33..7221ef0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3098,6 +3098,11 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D checkGLcall("glCopyTexSubImage2D"); LEAVE_GL(); + + /* The texture is now most up to date - If the surface is a render target and has a drawable, this + * path is never entered + */ + IWineD3DSurface_ModifyLocation((IWineD3DSurface *) This, SFLAG_INTEXTURE, TRUE); } /* Uses the hardware to stretch and flip the image */ @@ -3345,6 +3350,11 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine } LEAVE_GL(); + + /* The texture is now most up to date - If the surface is a render target and has a drawable, this + * path is never entered + */ + IWineD3DSurface_ModifyLocation((IWineD3DSurface *) This, SFLAG_INTEXTURE, TRUE); } /* Not called from the VTable */ @@ -3615,10 +3625,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const } else { This->Flags &= ~SFLAG_INSYSMEM; } - /* The texture is now most up to date - If the surface is a render target and has a drawable, this - * path is never entered - */ - IWineD3DSurface_ModifyLocation((IWineD3DSurface *) This, SFLAG_INTEXTURE, TRUE); return WINED3D_OK; } else if(Src) {

1 0

Stefan Dösinger : wined3d: Create a separate function for deleting GL textures.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: ba6fac697af10de7845f3690eb9891b93f46bfd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6fac697af10de7845f3690e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 19 15:06:35 2009 +0200 wined3d: Create a separate function for deleting GL textures. --- dlls/wined3d/basetexture.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 6da25e9..b38f668 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -70,25 +70,30 @@ void basetexture_cleanup(IWineD3DBaseTexture *iface) resource_cleanup((IWineD3DResource *)iface); } +/* A GL context is provided by the caller */ +static void gltexture_delete(struct gl_texture *tex) +{ + ENTER_GL(); + glDeleteTextures(1, &tex->name); + LEAVE_GL(); + tex->name = 0; +} + void basetexture_unload(IWineD3DBaseTexture *iface) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - if(This->baseTexture.texture_rgb.name) { + if(This->baseTexture.texture_rgb.name || + This->baseTexture.texture_srgb.name) { ActivateContext(device, NULL, CTXUSAGE_RESOURCELOAD); - ENTER_GL(); - glDeleteTextures(1, &This->baseTexture.texture_rgb.name); - This->baseTexture.texture_rgb.name = 0; - LEAVE_GL(); } + if(This->baseTexture.texture_rgb.name) { + gltexture_delete(&This->baseTexture.texture_rgb); + } if(This->baseTexture.texture_srgb.name) { - ActivateContext(device, NULL, CTXUSAGE_RESOURCELOAD); - ENTER_GL(); - glDeleteTextures(1, &This->baseTexture.texture_srgb.name); - This->baseTexture.texture_srgb.name = 0; - LEAVE_GL(); + gltexture_delete(&This->baseTexture.texture_srgb); } This->baseTexture.texture_rgb.dirty = TRUE; This->baseTexture.texture_srgb.dirty = TRUE;

1 0

Stefan Dösinger : wined3d: Use the correct enum.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: 529e6737d3724eb97190962be911a82835fbbc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529e6737d3724eb97190962be… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 19 15:00:37 2009 +0200 wined3d: Use the correct enum. --- dlls/wined3d/basetexture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 38427b5..6da25e9 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -451,9 +451,9 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, } } - if ((gl_tex->states[WINED3DSAMP_MAGFILTER] != WINED3DTEXF_ANISOTROPIC - && gl_tex->states[WINED3DSAMP_MINFILTER] != WINED3DTEXF_ANISOTROPIC - && gl_tex->states[WINED3DSAMP_MIPFILTER] != WINED3DTEXF_ANISOTROPIC) + if ((gl_tex->states[WINED3DTEXSTA_MAGFILTER] != WINED3DTEXF_ANISOTROPIC + && gl_tex->states[WINED3DTEXSTA_MINFILTER] != WINED3DTEXF_ANISOTROPIC + && gl_tex->states[WINED3DTEXSTA_MIPFILTER] != WINED3DTEXF_ANISOTROPIC) || cond_np2) { aniso = 1;

1 0

Stefan Dösinger : wined3d: Track GL texture states in a separate structure.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: 5b5e3bd0d2a777609a5f3cfe4cd4feb6c7b34f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5e3bd0d2a777609a5f3cfe4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 19 14:59:27 2009 +0200 wined3d: Track GL texture states in a separate structure. --- dlls/wined3d/basetexture.c | 148 ++++++++++++++++++++-------------------- dlls/wined3d/context.c | 12 ++-- dlls/wined3d/cubetexture.c | 10 ++-- dlls/wined3d/surface.c | 6 +- dlls/wined3d/texture.c | 30 +++++---- dlls/wined3d/volume.c | 3 +- dlls/wined3d/volumetexture.c | 7 +- dlls/wined3d/wined3d_private.h | 12 ++- 8 files changed, 118 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b5e3bd0d2a777609a5f3…

1 0

Henri Verbeet : wined3d: Cleanup after wglMakeCurrent() failures in context_set_current().
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: 1c93ab1ee0c66500838b730b11cc0c7f915e10a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c93ab1ee0c66500838b730b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:59 2009 +0200 wined3d: Cleanup after wglMakeCurrent() failures in context_set_current(). The D3D context is potentially destroyed, so we need to clear the thread's current D3D context. Found by Rico Schüller. --- dlls/wined3d/context.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e569e6e..935a92b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -759,7 +759,10 @@ BOOL context_set_current(struct wined3d_context *ctx) TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", ctx, ctx->glCtx, ctx->hdc); if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) { - ERR("Failed to make GL context %p current on device context %p.\n", ctx->glCtx, ctx->hdc); + DWORD err = GetLastError(); + ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", + ctx->glCtx, ctx->hdc, err); + TlsSetValue(wined3d_context_tls_idx, NULL); return FALSE; } ctx->current = 1; @@ -769,7 +772,9 @@ BOOL context_set_current(struct wined3d_context *ctx) TRACE("Clearing current D3D context.\n"); if (!pwglMakeCurrent(NULL, NULL)) { - ERR("Failed to clear current GL context.\n"); + DWORD err = GetLastError(); + ERR("Failed to clear current GL context, last error %#x.\n", err); + TlsSetValue(wined3d_context_tls_idx, NULL); return FALSE; } }

1 0

Henri Verbeet : wined3d: Add support for ARB_provoking_vertex.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: eca28c942d61528e02eca7ca402f36161381c87e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca28c942d61528e02eca7ca4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:58 2009 +0200 wined3d: Add support for ARB_provoking_vertex. This is just EXT_provoking_vertex promoted to ARB. --- dlls/wined3d/context.c | 6 +++++- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 878e5bf..e569e6e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1362,7 +1362,11 @@ struct wined3d_context *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceI checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); } - if (GL_SUPPORT(EXT_PROVOKING_VERTEX)) + if (GL_SUPPORT(ARB_PROVOKING_VERTEX)) + { + GL_EXTCALL(glProvokingVertex(GL_FIRST_VERTEX_CONVENTION)); + } + else if (GL_SUPPORT(EXT_PROVOKING_VERTEX)) { GL_EXTCALL(glProvokingVertexEXT(GL_FIRST_VERTEX_CONVENTION_EXT)); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2f4cdae..7b46c0f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -72,6 +72,7 @@ static const struct { {"GL_ARB_pixel_buffer_object", ARB_PIXEL_BUFFER_OBJECT, 0 }, {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS, 0 }, {"GL_ARB_point_sprite", ARB_POINT_SPRITE, 0 }, + {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX, 0 }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP, 0 }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION, 0 }, {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 1c9ce6c..1030931 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1884,6 +1884,17 @@ typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, #endif typedef void (WINE_GLAPI * PGLFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param); typedef void (WINE_GLAPI * PGLFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params); + +/* GL_ARB_provoking_vertex */ +#ifndef GL_ARB_provoking_vertex +#define GL_ARB_provoking_vertex 1 +#define GL_FIRST_VERTEX_CONVENTION 0x8e4d +#define GL_LAST_VERTEX_CONVENTION 0x8e4e +#define GL_PROVOKING_VERTEX 0x8e4f +#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8e4c +#endif +typedef void (WINE_GLAPI * PGLFNGLPROVOKINGVERTEXPROC)(GLenum mode); + /* GL_ARB_vertex_blend */ #ifndef GL_ARB_vertex_blend #define GL_ARB_vertex_blend 1 @@ -3549,6 +3560,7 @@ typedef enum _GL_SupportedExt { ARB_MULTITEXTURE, ARB_OCCLUSION_QUERY, ARB_POINT_PARAMETERS, + ARB_PROVOKING_VERTEX, ARB_PIXEL_BUFFER_OBJECT, ARB_POINT_SPRITE, ARB_TEXTURE_COMPRESSION, @@ -3714,6 +3726,8 @@ typedef enum _GL_SupportedExt { /* GL_ARB_point_parameters */ \ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFARBPROC, glPointParameterfARB, ARB_POINT_PARAMETERS, NULL )\ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFVARBPROC, glPointParameterfvARB, ARB_POINT_PARAMETERS, NULL )\ + /* GL_ARB_provoking_vertex */ \ + USE_GL_FUNC(PGLFNGLPROVOKINGVERTEXPROC, glProvokingVertex, ARB_PROVOKING_VERTEX, NULL)\ /* GL_ARB_texture_compression */ \ USE_GL_FUNC(PGLFNCOMPRESSEDTEXIMAGE2DPROC, glCompressedTexImage2DARB, ARB_TEXTURE_COMPRESSION,NULL )\ USE_GL_FUNC(PGLFNCOMPRESSEDTEXIMAGE3DPROC, glCompressedTexImage3DARB, ARB_TEXTURE_COMPRESSION,NULL )\

1 0

Henri Verbeet : wined3d: Don' t create a depthstencil renderbuffer if ARB_framebuffer_object is supported .
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: 34dd27e3a8f9affb919db6f7c912040ded8eace8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34dd27e3a8f9affb919db6f7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:56 2009 +0200 wined3d: Don't create a depthstencil renderbuffer if ARB_framebuffer_object is supported. --- dlls/wined3d/surface.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 564f6b3..920e759 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -622,7 +622,9 @@ void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int wi if (width > src_width || height > src_height) return; /* Remove any renderbuffer set if the sizes match */ - if (width == src_width && height == src_height) { + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] + || (width == src_width && height == src_height)) + { This->current_renderbuffer = NULL; return; }

1 0