wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Huw Davies : msctf/tests: Fix a compiler warning.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: fcf86b618a13ac1550e26df34bef919c2bfc3977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf86b618a13ac1550e26df34… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 12:43:55 2009 +0100 msctf/tests: Fix a compiler warning. --- dlls/msctf/tests/inputprocessor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index a3070fc..3728711 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -823,7 +823,9 @@ static void test_ThreadMgrAdviseSinks(void) if (!source) return; - ThreadMgrEventSink_Constructor(&sink); + hr = ThreadMgrEventSink_Constructor(&sink); + ok(hr == S_OK, "got %08x\n", hr); + if(FAILED(hr)) return; tmSinkRefCount = 1; tmSinkCookie = 0;

1 0

Huw Davies : ole32: Add proxies and stubs for FillAppend and FillAt.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: e4d43c1099b105f6988d93a2e1f56836667b45f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d43c1099b105f6988d93a2e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 15 13:45:03 2009 +0100 ole32: Add proxies and stubs for FillAppend and FillAt. --- dlls/ole32/usrmarshal.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 5706c6d..57a048e 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2549,8 +2549,15 @@ HRESULT CALLBACK IFillLockBytes_FillAppend_Proxy( ULONG cb, ULONG *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG written; + HRESULT hr; + + TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbWritten); + + hr = IFillLockBytes_RemoteFillAppend_Proxy(This, pv, cb, &written); + if(pcbWritten) *pcbWritten = written; + + return hr; } HRESULT __RPC_STUB IFillLockBytes_FillAppend_Stub( @@ -2559,8 +2566,8 @@ HRESULT __RPC_STUB IFillLockBytes_FillAppend_Stub( ULONG cb, ULONG *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbWritten); + return IFillLockBytes_FillAppend(This, pv, cb, pcbWritten); } HRESULT CALLBACK IFillLockBytes_FillAt_Proxy( @@ -2570,8 +2577,15 @@ HRESULT CALLBACK IFillLockBytes_FillAt_Proxy( ULONG cb, ULONG *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG written; + HRESULT hr; + + TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); + + hr = IFillLockBytes_RemoteFillAt_Proxy(This, ulOffset, pv, cb, &written); + if(pcbWritten) *pcbWritten = written; + + return hr; } HRESULT __RPC_STUB IFillLockBytes_FillAt_Stub( @@ -2581,8 +2595,8 @@ HRESULT __RPC_STUB IFillLockBytes_FillAt_Stub( ULONG cb, ULONG *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); + return IFillLockBytes_FillAt(This, ulOffset, pv, cb, pcbWritten); } HRESULT CALLBACK IEnumFORMATETC_Next_Proxy(

1 0

Huw Davies : ole32: Add proxies and stubs for ReadAt and WriteAt.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 069d57502d5ac5b8ce768afbf325f30f6959be15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069d57502d5ac5b8ce768afbf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 15 13:38:47 2009 +0100 ole32: Add proxies and stubs for ReadAt and WriteAt. --- dlls/ole32/usrmarshal.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 82609ee..5706c6d 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2492,8 +2492,15 @@ HRESULT CALLBACK ILockBytes_ReadAt_Proxy( ULONG cb, ULONG *pcbRead) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG read; + HRESULT hr; + + TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbRead); + + hr = ILockBytes_RemoteReadAt_Proxy(This, ulOffset, pv, cb, &read); + if(pcbRead) *pcbRead = read; + + return hr; } HRESULT __RPC_STUB ILockBytes_ReadAt_Stub( @@ -2503,8 +2510,8 @@ HRESULT __RPC_STUB ILockBytes_ReadAt_Stub( ULONG cb, ULONG *pcbRead) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbRead); + return ILockBytes_ReadAt(This, ulOffset, pv, cb, pcbRead); } HRESULT CALLBACK ILockBytes_WriteAt_Proxy( @@ -2514,8 +2521,15 @@ HRESULT CALLBACK ILockBytes_WriteAt_Proxy( ULONG cb, ULONG *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG written; + HRESULT hr; + + TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); + + hr = ILockBytes_RemoteWriteAt_Proxy(This, ulOffset, pv, cb, &written); + if(pcbWritten) *pcbWritten = written; + + return hr; } HRESULT __RPC_STUB ILockBytes_WriteAt_Stub( @@ -2525,8 +2539,8 @@ HRESULT __RPC_STUB ILockBytes_WriteAt_Stub( ULONG cb, ULONG *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%s, %p, %d, %p)\n", This, wine_dbgstr_longlong(ulOffset.QuadPart), pv, cb, pcbWritten); + return ILockBytes_WriteAt(This, ulOffset, pv, cb, pcbWritten); } HRESULT CALLBACK IFillLockBytes_FillAppend_Proxy(

1 0

Huw Davies : ole32: Add proxies and stubs for OpenStream and EnumElements.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 5abb393eb7b35a10c9ee811f9532d049e3353f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5abb393eb7b35a10c9ee811f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 15 12:51:02 2009 +0100 ole32: Add proxies and stubs for OpenStream and EnumElements. --- dlls/ole32/usrmarshal.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index b85eec6..82609ee 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2437,8 +2437,10 @@ HRESULT CALLBACK IStorage_OpenStream_Proxy( DWORD reserved2, IStream **ppstm) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%s, %p, %08x, %d %p)\n", This, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm); + if(reserved1) WARN("reserved1 %p\n", reserved1); + + return IStorage_RemoteOpenStream_Proxy(This, pwcsName, 0, NULL, grfMode, reserved2, ppstm); } HRESULT __RPC_STUB IStorage_OpenStream_Stub( @@ -2450,8 +2452,10 @@ HRESULT __RPC_STUB IStorage_OpenStream_Stub( DWORD reserved2, IStream **ppstm) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%s, %d, %p, %08x, %d %p)\n", This, debugstr_w(pwcsName), cbReserved1, reserved1, grfMode, reserved2, ppstm); + if(cbReserved1 || reserved1) WARN("cbReserved1 %d reserved1 %p\n", cbReserved1, reserved1); + + return IStorage_OpenStream(This, pwcsName, NULL, grfMode, reserved2, ppstm); } HRESULT CALLBACK IStorage_EnumElements_Proxy( @@ -2461,8 +2465,10 @@ HRESULT CALLBACK IStorage_EnumElements_Proxy( DWORD reserved3, IEnumSTATSTG **ppenum) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%d, %p, %d, %p)\n", This, reserved1, reserved2, reserved3, ppenum); + if(reserved2) WARN("reserved2 %p\n", reserved2); + + return IStorage_RemoteEnumElements_Proxy(This, reserved1, 0, NULL, reserved3, ppenum); } HRESULT __RPC_STUB IStorage_EnumElements_Stub( @@ -2473,8 +2479,10 @@ HRESULT __RPC_STUB IStorage_EnumElements_Stub( DWORD reserved3, IEnumSTATSTG **ppenum) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%d, %d, %p, %d, %p)\n", This, reserved1, cbReserved2, reserved2, reserved3, ppenum); + if(cbReserved2 || reserved2) WARN("cbReserved2 %d reserved2 %p\n", cbReserved2, reserved2); + + return IStorage_EnumElements(This, reserved1, NULL, reserved3, ppenum); } HRESULT CALLBACK ILockBytes_ReadAt_Proxy(

1 0

Huw Davies : ole32: Add proxies and stubs for Seek and CopyTo.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: aa13c7c522270706f177860d28135277d091f3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa13c7c522270706f177860d2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 17:26:16 2009 +0100 ole32: Add proxies and stubs for Seek and CopyTo. --- dlls/ole32/usrmarshal.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 2669faa..b85eec6 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2351,8 +2351,15 @@ HRESULT CALLBACK IStream_Seek_Proxy( DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULARGE_INTEGER newpos; + HRESULT hr; + + TRACE("(%p)->(%s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + + hr = IStream_RemoteSeek_Proxy(This, dlibMove, dwOrigin, &newpos); + if(plibNewPosition) *plibNewPosition = newpos; + + return hr; } HRESULT __RPC_STUB IStream_Seek_Stub( @@ -2361,8 +2368,8 @@ HRESULT __RPC_STUB IStream_Seek_Stub( DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + return IStream_Seek(This, dlibMove, dwOrigin, plibNewPosition); } HRESULT CALLBACK IStream_CopyTo_Proxy( @@ -2372,8 +2379,16 @@ HRESULT CALLBACK IStream_CopyTo_Proxy( ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULARGE_INTEGER read, written; + HRESULT hr; + + TRACE("(%p)->(%p, %s, %p, %p)\n", This, pstm, wine_dbgstr_longlong(cb.QuadPart), pcbRead, pcbWritten); + + hr = IStream_RemoteCopyTo_Proxy(This, pstm, cb, &read, &written); + if(pcbRead) *pcbRead = read; + if(pcbWritten) *pcbWritten = written; + + return hr; } HRESULT __RPC_STUB IStream_CopyTo_Stub( @@ -2383,8 +2398,9 @@ HRESULT __RPC_STUB IStream_CopyTo_Stub( ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %s, %p, %p)\n", This, pstm, wine_dbgstr_longlong(cb.QuadPart), pcbRead, pcbWritten); + + return IStream_CopyTo(This, pstm, cb, pcbRead, pcbWritten); } HRESULT CALLBACK IEnumSTATSTG_Next_Proxy(

1 0

Huw Davies : ole32: Add proxies and stubs for Read and Write.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: e8be59b8f83f86aa1db1f998ccd91d6fa54d59da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8be59b8f83f86aa1db1f998c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 17:14:29 2009 +0100 ole32: Add proxies and stubs for Read and Write. --- dlls/ole32/usrmarshal.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 07fd805..2669faa 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2297,8 +2297,15 @@ HRESULT CALLBACK ISequentialStream_Read_Proxy( ULONG cb, ULONG *pcbRead) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG read; + HRESULT hr; + + TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbRead); + + hr = ISequentialStream_RemoteRead_Proxy(This, pv, cb, &read); + if(pcbRead) *pcbRead = read; + + return hr; } HRESULT __RPC_STUB ISequentialStream_Read_Stub( @@ -2307,8 +2314,8 @@ HRESULT __RPC_STUB ISequentialStream_Read_Stub( ULONG cb, ULONG *pcbRead) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbRead); + return ISequentialStream_Read(This, pv, cb, pcbRead); } HRESULT CALLBACK ISequentialStream_Write_Proxy( @@ -2317,8 +2324,15 @@ HRESULT CALLBACK ISequentialStream_Write_Proxy( ULONG cb, ULONG *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG written; + HRESULT hr; + + TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbWritten); + + hr = ISequentialStream_RemoteWrite_Proxy(This, pv, cb, &written); + if(pcbWritten) *pcbWritten = written; + + return hr; } HRESULT __RPC_STUB ISequentialStream_Write_Stub( @@ -2327,8 +2341,8 @@ HRESULT __RPC_STUB ISequentialStream_Write_Stub( ULONG cb, ULONG *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbWritten); + return ISequentialStream_Write(This, pv, cb, pcbWritten); } HRESULT CALLBACK IStream_Seek_Proxy(

1 0

Huw Davies : ole32: Add proxies and stubs for GetData and GetDataHere.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 374aacdc9f3123fad5c9867f8f9ef30cfc85b67e URL: http://source.winehq.org/git/wine.git/?a=commit;h=374aacdc9f3123fad5c9867f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 16:55:14 2009 +0100 ole32: Add proxies and stubs for GetData and GetDataHere. --- dlls/ole32/usrmarshal.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 8159a60..07fd805 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2678,8 +2678,8 @@ HRESULT CALLBACK IDataObject_GetData_Proxy( FORMATETC *pformatetcIn, STGMEDIUM *pmedium) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", This, pformatetcIn, pmedium); + return IDataObject_RemoteGetData_Proxy(This, pformatetcIn, pmedium); } HRESULT __RPC_STUB IDataObject_GetData_Stub( @@ -2687,8 +2687,8 @@ HRESULT __RPC_STUB IDataObject_GetData_Stub( FORMATETC *pformatetcIn, STGMEDIUM *pRemoteMedium) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", This, pformatetcIn, pRemoteMedium); + return IDataObject_GetData(This, pformatetcIn, pRemoteMedium); } HRESULT CALLBACK IDataObject_GetDataHere_Proxy( @@ -2696,8 +2696,8 @@ HRESULT CALLBACK IDataObject_GetDataHere_Proxy( FORMATETC *pformatetc, STGMEDIUM *pmedium) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", This, pformatetc, pmedium); + return IDataObject_RemoteGetDataHere_Proxy(This, pformatetc, pmedium); } HRESULT __RPC_STUB IDataObject_GetDataHere_Stub( @@ -2705,8 +2705,8 @@ HRESULT __RPC_STUB IDataObject_GetDataHere_Stub( FORMATETC *pformatetc, STGMEDIUM *pRemoteMedium) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", This, pformatetc, pRemoteMedium); + return IDataObject_GetDataHere(This, pformatetc, pRemoteMedium); } HRESULT CALLBACK IDataObject_SetData_Proxy(

1 0

Huw Davies : include: Correct a typo.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 53f576ca9c62c46d962bb0aa8459074025b81ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f576ca9c62c46d962bb0aa8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 15 15:05:13 2009 +0100 include: Correct a typo. --- include/objidl.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index b3dcf65..29b907d 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -2442,7 +2442,7 @@ interface IContext : IUnknown [in] CPFLAGS flags, [in] IUnknown *pUnk); - HRESULT RemovePropert( + HRESULT RemoveProperty( [in] REFGUID policyId); HRESULT GetProperty(

1 0

Roderick Colenbrander : wgl: Make sure WGL_DRAW_TO_BITMAP_ARB is only seen on our duplicated bitmap-capable formats .
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 73546edc9f1f5d5830afd754ab7f3346f15ec61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=73546edc9f1f5d5830afd754a… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun May 17 21:50:56 2009 +0200 wgl: Make sure WGL_DRAW_TO_BITMAP_ARB is only seen on our duplicated bitmap-capable formats. --- dlls/winex11.drv/opengl.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 96158dc..3696072 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -693,12 +693,9 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf break; case WGL_DRAW_TO_BITMAP_ARB: + /* This flag is set in a WineGLPixelFormat */ pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_DRAW_TO_BITMAP_ARB: %d\n", cur, pop); - /* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */ - if (pop) { - drawattrib |= GLX_PIXMAP_BIT; - } break; case WGL_DRAW_TO_WINDOW_ARB: @@ -2691,11 +2688,16 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt * using glXChooseFBConfig but we filter the result of glXChooseFBConfig later on by passing a dwFlags to 'ConvertPixelFormatGLXtoWGL'. */ for(i=0; piAttribIList[i] != 0; i+=2) { - if(piAttribIList[i] == WGL_SUPPORT_GDI_ARB) + switch(piAttribIList[i]) { - if(piAttribIList[i+1]) - dwFlags |= PFD_SUPPORT_GDI; - break; + case WGL_DRAW_TO_BITMAP_ARB: + if(piAttribIList[i+1]) + dwFlags |= PFD_DRAW_TO_BITMAP; + break; + case WGL_SUPPORT_GDI_ARB: + if(piAttribIList[i+1]) + dwFlags |= PFD_SUPPORT_GDI; + break; } } @@ -2891,14 +2893,17 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF piValues[i] = (fmt->dwFlags & PFD_SUPPORT_GDI) ? TRUE : FALSE; continue; - case WGL_DRAW_TO_WINDOW_ARB: case WGL_DRAW_TO_BITMAP_ARB: + if (!fmt) goto pix_error; + piValues[i] = (fmt->dwFlags & PFD_DRAW_TO_BITMAP) ? TRUE : FALSE; + continue; + + case WGL_DRAW_TO_WINDOW_ARB: case WGL_DRAW_TO_PBUFFER_ARB: if (!fmt) goto pix_error; hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &tmp); if (hTest) goto get_error; if((curWGLAttr == WGL_DRAW_TO_WINDOW_ARB && (tmp&GLX_WINDOW_BIT)) || - (curWGLAttr == WGL_DRAW_TO_BITMAP_ARB && (tmp&GLX_PIXMAP_BIT)) || (curWGLAttr == WGL_DRAW_TO_PBUFFER_ARB && (tmp&GLX_PBUFFER_BIT))) piValues[i] = GL_TRUE; else

1 0

Roderick Colenbrander : wgl: Make sure WGL_SUPPORT_GDI_ARB is only seen on formats on which we set it during startup (in get_formats).
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 2eec8aca02950dbe3a838a22656b57f6eed3fd67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eec8aca02950dbe3a838a226… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat May 16 21:50:58 2009 +0200 wgl: Make sure WGL_SUPPORT_GDI_ARB is only seen on formats on which we set it during startup (in get_formats). --- dlls/winex11.drv/opengl.c | 52 +++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 774e4ca..96158dc 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -613,8 +613,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf int drawattrib = 0; int nvfloatattrib = GLX_DONT_CARE; int pixelattrib = 0; - int supportgdi = -1; - int doublebuf = -1; /* The list of WGL attributes is allowed to be NULL. We don't return here for NULL * because we need to do fixups for GLX_DRAWABLE_TYPE/GLX_RENDER_TYPE/GLX_FLOAT_COMPONENTS_NV. */ @@ -666,7 +664,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_DOUBLEBUFFER, pop); TRACE("pAttr[%d] = GLX_DOUBLEBUFFER: %d\n", cur, pop); - doublebuf = pop; break; case WGL_STEREO_ARB: pop = iWGLAttr[++cur]; @@ -690,10 +687,9 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf break; case WGL_SUPPORT_GDI_ARB: + /* This flag is set in a WineGLPixelFormat */ pop = iWGLAttr[++cur]; - PUSH2(oGLXAttr, GLX_X_RENDERABLE, pop); TRACE("pAttr[%d] = WGL_SUPPORT_GDI_ARB: %d\n", cur, pop); - supportgdi = pop; break; case WGL_DRAW_TO_BITMAP_ARB: @@ -810,15 +806,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf ++cur; } - if(supportgdi > 0) { - if(doublebuf > 0) { - WARN("Attempting double-buffered gdi format\n"); - return -1; - } - if(doublebuf < 0) - PUSH2(oGLXAttr, GLX_DOUBLEBUFFER, False); - } - /* Apply the OR'd drawable type bitmask now EVEN when WGL_DRAW_TO* is unset. * It is needed in all cases because GLX_DRAWABLE_TYPE default to GLX_WINDOW_BIT. */ PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, drawattrib); @@ -1011,7 +998,7 @@ static WineGLPixelFormat* ConvertPixelFormatWGLtoGLX(Display *display, int iPixe } /* Search our internal pixelformat list for the WGL format corresponding to the given fbconfig */ -static WineGLPixelFormat* ConvertPixelFormatGLXtoWGL(Display *display, int fmt_id) +static WineGLPixelFormat* ConvertPixelFormatGLXtoWGL(Display *display, int fmt_id, DWORD dwFlags) { WineGLPixelFormat *list; int i, size; @@ -1019,7 +1006,9 @@ static WineGLPixelFormat* ConvertPixelFormatGLXtoWGL(Display *display, int fmt_i if (!(list = get_formats(display, &size, NULL ))) return NULL; for(i=0; i<size; i++) { - if(list[i].fmt_id == fmt_id) { + /* A GLX format can appear multiple times in the pixel format list due to fake formats for bitmap rendering. + * Fake formats might get selected when the user passes the proper flags using the dwFlags parameter. */ + if( (list[i].fmt_id == fmt_id) && ((list[i].dwFlags & dwFlags) == dwFlags) ) { TRACE("Returning iPixelFormat %d for fmt_id 0x%x\n", list[i].iPixelFormat, fmt_id); return &list[i]; } @@ -1034,7 +1023,7 @@ int pixelformat_from_fbconfig_id(XID fbconfig_id) if (!fbconfig_id) return 0; - fmt = ConvertPixelFormatGLXtoWGL(gdi_display, fbconfig_id); + fmt = ConvertPixelFormatGLXtoWGL(gdi_display, fbconfig_id, 0 /* no flags */); if(fmt) return fmt->iPixelFormat; /* This will happen on hwnds without a pixel format set; it's ok */ @@ -2682,6 +2671,8 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt WineGLPixelFormat *fmt; UINT pfmt_it = 0; int run; + int i; + DWORD dwFlags = 0; TRACE("(%p, %p, %p, %d, %p, %p): hackish\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats); if (NULL != pfAttribFList) { @@ -2695,6 +2686,19 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt } PUSH1(attribs, None); + /* There is no 1:1 mapping between GLX and WGL formats because we duplicate some GLX formats for bitmap rendering (see get_formats). + * Flags like PFD_SUPPORT_GDI, PFD_DRAW_TO_BITMAP and others are a property of the WineGLPixelFormat. We don't query these attributes + * using glXChooseFBConfig but we filter the result of glXChooseFBConfig later on by passing a dwFlags to 'ConvertPixelFormatGLXtoWGL'. */ + for(i=0; piAttribIList[i] != 0; i+=2) + { + if(piAttribIList[i] == WGL_SUPPORT_GDI_ARB) + { + if(piAttribIList[i+1]) + dwFlags |= PFD_SUPPORT_GDI; + break; + } + } + /* Search for FB configurations matching the requirements in attribs */ wine_tsx11_lock(); cfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), attribs, &nCfgs); @@ -2716,7 +2720,7 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt } /* Search for the format in our list of compatible formats */ - fmt = ConvertPixelFormatGLXtoWGL(gdi_display, fmt_id); + fmt = ConvertPixelFormatGLXtoWGL(gdi_display, fmt_id, dwFlags); if(!fmt) continue; @@ -2884,14 +2888,8 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF case WGL_SUPPORT_GDI_ARB: if (!fmt) goto pix_error; - hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DOUBLEBUFFER, &tmp); - if (hTest) goto get_error; - if(tmp) { - piValues[i] = GL_FALSE; - continue; - } - curGLXAttr = GLX_X_RENDERABLE; - break; + piValues[i] = (fmt->dwFlags & PFD_SUPPORT_GDI) ? TRUE : FALSE; + continue; case WGL_DRAW_TO_WINDOW_ARB: case WGL_DRAW_TO_BITMAP_ARB: @@ -3596,7 +3594,7 @@ XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id ) WineGLPixelFormat *fmt; XVisualInfo *ret; - fmt = ConvertPixelFormatGLXtoWGL(gdi_display, fbconfig_id); + fmt = ConvertPixelFormatGLXtoWGL(gdi_display, fbconfig_id, 0 /* no flags */); if(fmt == NULL) return NULL;

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009