June 2009 - Wine-Commits - list.winehq.org

Gerald Pfeifer : winmm: Use & instead of && for bit test in wave_out_test_deviceOut().
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: c4a0539a79a73905b581d2f9d2dbc0d57b52b86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a0539a79a73905b581d2f9d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 7 11:28:44 2009 +0200 winmm: Use & instead of && for bit test in wave_out_test_deviceOut(). --- dlls/winmm/tests/wave.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index b509f74..97544c0 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -640,7 +640,7 @@ static void wave_out_test_deviceOut(int device, double duration, trace("CALLBACK_THREAD not implemented\n"); CloseHandle(hevent); return; - } else if (flags && CALLBACK_TYPEMASK) { + } else if (flags & CALLBACK_TYPEMASK) { trace("Undefined callback type!\n"); CloseHandle(hevent); return;

1 0

Marcus Meissner : widl: ifdef some not always present LANG_*.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 6a9e096da956c6b6a61ec4a8740962328f71910b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9e096da956c6b6a61ec4a87… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 7 11:19:39 2009 +0200 widl: ifdef some not always present LANG_*. --- tools/widl/hash.c | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-) diff --git a/tools/widl/hash.c b/tools/widl/hash.c index bd20995..7900544 100644 --- a/tools/widl/hash.c +++ b/tools/widl/hash.c @@ -536,13 +536,38 @@ unsigned int lhash_val_of_name_sys( syskind_t skind, LCID lcid, LPCSTR lpStr) case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL: case LANG_TATAR: case LANG_TELUGU: case LANG_THAI: case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK: - case LANG_VIETNAMESE: case LANG_GAELIC: case LANG_MALTESE: - case LANG_TAJIK: case LANG_ROMANSH: case LANG_IRISH: - case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_SUTU: - case LANG_TSONGA: case LANG_TSWANA: case LANG_VENDA: - case LANG_XHOSA: case LANG_ZULU: case LANG_ESPERANTO: - case LANG_WALON: case LANG_CORNISH: case LANG_WELSH: + case LANG_VIETNAMESE: case LANG_MALTESE: case LANG_IRISH: + case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_TSWANA: + case LANG_XHOSA: case LANG_ZULU: case LANG_WELSH: case LANG_BRETON: +/* some languages not in all windows versions or ReactOS */ +#ifdef LANG_GAELIC + case LANG_GAELIC: +#endif +#ifdef LANG_TAJIK + case LANG_TAJIK: +#endif +#ifdef LANG_ROMANSH + case LANG_ROMANSH: +#endif +#ifdef LANG_SUTU + case LANG_SUTU: +#endif +#ifdef LANG_TSONGA + case LANG_TSONGA: +#endif +#ifdef LANG_VENDA + case LANG_VENDA: +#endif +#ifdef LANG_ESPERANTO + case LANG_ESPERANTO: +#endif +#ifdef LANG_WALON + case LANG_WALON: +#endif +#ifdef LANG_CORNISH + case LANG_CORNISH: +#endif nOffset = 16; pnLookup = Lookup_16; break;

1 0

Rein Klazes : gdi32: Fix RectInRegion() if right < left or bottom < top.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: d145f399cadb06a09a9468ff54efdccc68d2cc7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d145f399cadb06a09a9468ff5… Author: Rein Klazes <wijn(a)online.nl> Date: Sat Jun 6 19:56:58 2009 +0200 gdi32: Fix RectInRegion() if right < left or bottom < top. --- dlls/gdi32/region.c | 28 +++++++++++++++++++++++----- dlls/gdi32/tests/gdiobj.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index f9d078c..f3c5e13 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1144,27 +1144,45 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) { RGNOBJ * obj; BOOL ret = FALSE; + RECT rc; + + /* swap the coordinates to make right >= left and bottom >= top */ + /* (region building rectangles are normalized the same way) */ + if( rect->top > rect->bottom) { + rc.top = rect->bottom; + rc.bottom = rect->top; + } else { + rc.top = rect->top; + rc.bottom = rect->bottom; + } + if( rect->right < rect->left) { + rc.right = rect->left; + rc.left = rect->right; + } else { + rc.right = rect->right; + rc.left = rect->left; + } if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) { RECT *pCurRect, *pRectEnd; /* this is (just) a useful optimization */ - if ((obj->rgn.numRects > 0) && EXTENTCHECK(&obj->rgn.extents, rect)) + if ((obj->rgn.numRects > 0) && EXTENTCHECK(&obj->rgn.extents, &rc)) { for (pCurRect = obj->rgn.rects, pRectEnd = pCurRect + obj->rgn.numRects; pCurRect < pRectEnd; pCurRect++) { - if (pCurRect->bottom <= rect->top) + if (pCurRect->bottom <= rc.top) continue; /* not far enough down yet */ - if (pCurRect->top >= rect->bottom) + if (pCurRect->top >= rc.bottom) break; /* too far down */ - if (pCurRect->right <= rect->left) + if (pCurRect->right <= rc.left) continue; /* not far enough over yet */ - if (pCurRect->left >= rect->right) { + if (pCurRect->left >= rc.right) { continue; } diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 67a135e..c1adc0f 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -266,9 +266,49 @@ static void test_GetCurrentObject(void) DeleteDC(hdc); } +static void test_region(void) +{ + HRGN hrgn = CreateRectRgn(10, 10, 20, 20); + RECT rc = { 5, 5, 15, 15 }; + BOOL ret = RectInRegion( hrgn, &rc); + ok( ret, "RectInRegion should return TRUE\n"); + /* swap left and right */ + SetRect( &rc, 15, 5, 5, 15 ); + ret = RectInRegion( hrgn, &rc); + ok( ret, "RectInRegion should return TRUE\n"); + /* swap top and bottom */ + SetRect( &rc, 5, 15, 15, 5 ); + ret = RectInRegion( hrgn, &rc); + ok( ret, "RectInRegion should return TRUE\n"); + /* swap both */ + SetRect( &rc, 15, 15, 5, 5 ); + ret = RectInRegion( hrgn, &rc); + ok( ret, "RectInRegion should return TRUE\n"); + DeleteObject(hrgn); + /* swap left and right in the region */ + hrgn = CreateRectRgn(20, 10, 10, 20); + SetRect( &rc, 5, 5, 15, 15 ); + ret = RectInRegion( hrgn, &rc); + ok( ret, "RectInRegion should return TRUE\n"); + /* swap left and right */ + SetRect( &rc, 15, 5, 5, 15 ); + ret = RectInRegion( hrgn, &rc); + ok( ret, "RectInRegion should return TRUE\n"); + /* swap top and bottom */ + SetRect( &rc, 5, 15, 15, 5 ); + ret = RectInRegion( hrgn, &rc); + ok( ret, "RectInRegion should return TRUE\n"); + /* swap both */ + SetRect( &rc, 15, 15, 5, 5 ); + ret = RectInRegion( hrgn, &rc); + ok( ret, "RectInRegion should return TRUE\n"); + DeleteObject(hrgn); +} + START_TEST(gdiobj) { test_gdi_objects(); test_thread_objects(); test_GetCurrentObject(); + test_region(); }

1 0

Henri Verbeet : wined3d: Use GL_DEPTH32F_STENCIL8 for WINED3DFMT_D24FS8.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 13aea3a1314f19f05601bae20c6f17ab847b4271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13aea3a1314f19f05601bae20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 8 10:35:05 2009 +0200 wined3d: Use GL_DEPTH32F_STENCIL8 for WINED3DFMT_D24FS8. --- dlls/wined3d/utils.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 29f40a4..c7b734a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -450,14 +450,10 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_DEPTH_COMPONENT, GL_FLOAT, WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_BUFFER_FLOAT}, - {WINED3DFMT_D24FS8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, - GL_DEPTH_COMPONENT, GL_FLOAT, - WINED3DFMT_FLAG_DEPTH, - ARB_DEPTH_TEXTURE}, - {WINED3DFMT_D24FS8, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, - GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, + {WINED3DFMT_D24FS8, GL_DEPTH32F_STENCIL8, GL_DEPTH32F_STENCIL8, 0, + GL_DEPTH_STENCIL_EXT, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, - EXT_PACKED_DEPTH_STENCIL}, + ARB_DEPTH_BUFFER_FLOAT}, /* Vendor-specific formats */ {WINED3DFMT_ATI2N, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,

1 0

Vincent Povirk : include: Add wincodec.idl.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: ad9036e1ff20ffcee5048b9e3381ff0eb49ece40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9036e1ff20ffcee5048b9e3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 28 15:25:35 2009 -0500 include: Add wincodec.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/wincodec.idl | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 78ff6c5..a47a096 100644 --- a/.gitignore +++ b/.gitignore @@ -165,6 +165,7 @@ include/unknwn.h include/urlhist.h include/urlmon.h include/vmr9.h +include/wincodec.h include/wine/itss.h include/wine/svcctl.h include/wine/wined3d.h diff --git a/include/Makefile.in b/include/Makefile.in index be2762a..3d80857 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -77,6 +77,7 @@ PUBLIC_IDL_H_SRCS = \ urlhist.idl \ urlmon.idl \ vmr9.idl \ + wincodec.idl \ wine/itss.idl \ wine/svcctl.idl \ wtypes.idl \ diff --git a/include/wincodec.idl b/include/wincodec.idl new file mode 100644 index 0000000..1296467 --- /dev/null +++ b/include/wincodec.idl @@ -0,0 +1,193 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "wtypes.idl"; +import "propidl.idl"; +import "objidl.idl"; +import "ocidl.idl"; + +#define CODEC_FORCE_DWORD 0x7fffffff + +typedef enum WICDecodeOptions { + WICDecodeMetadataCacheOnDemand = 0x00000000, + WICDecodeMetadataCacheOnLoad = 0x00000001, + WICMETADATACACHEOPTION_FORCE_DWORD = CODEC_FORCE_DWORD +} WICDecodeOptions; + +typedef enum WICBitmapCreateCacheOption { + WICBitmapNoCache = 0x00000000, + WICBitmapCacheOnDemand = 0x00000001, + WICBitmapCacheOnLoad = 0x00000002, + WICBITMAPCREATECACHEOPTION_FORCE_DWORD = CODEC_FORCE_DWORD +} WICBitmapCreateCacheOption; + +typedef enum WICBitmapAlphaChannelOption { + WICBitmapUseAlpha = 0x00000000, + WICBitmapUsePremultipliedAlpha = 0x00000001, + WICBitmapIgnoreAlpha = 0x00000002, + WICBITMAPALPHACHANNELOPTIONS_FORCE_DWORD = CODEC_FORCE_DWORD +} WICBitmapAlphaChannelOption; + +typedef GUID WICPixelFormatGUID; +typedef REFGUID REFWICPixelFormatGUID; + +interface IWICBitmapSource; +interface IWICBitmapDecoder; +interface IWICBitmap; +interface IWICComponentInfo; +interface IWICBitmapEncoder; +interface IWICPalette; +interface IWICFormatConverter; +interface IWICBitmapScaler; +interface IWICBitmapClipper; +interface IWICBitmapFlipRotator; +interface IWICStream; +interface IWICColorContext; +interface IWICColorTransform; +interface IWICBitmapFrameDecode; +interface IWICFastMetadataEncoder; +interface IWICMetadataQueryReader; +interface IWICMetadataQueryWriter; + +cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") + +[ + object, + uuid(ec5ec8a9-c395-4314-9c77-54d7a935ff70) +] +interface IWICImagingFactory : IUnknown +{ + HRESULT CreateDecoderFromFilename( + [in] LPCWSTR wzFilename, + [in, unique] const GUID *pguidVendor, + [in] DWORD dwDesiredAccess, + [in] WICDecodeOptions metadataOptions, + [out, retval] IWICBitmapDecoder **ppIDecoder); + + HRESULT CreateDecoderFromStream( + [in] IStream *pIStream, + [in, unique] const GUID *pguidVendor, + [in] WICDecodeOptions metadataOptions, + [out, retval] IWICBitmapDecoder **ppIDecoder); + + HRESULT CreateDecoderFromFileHandle( + [in] ULONG_PTR hFile, + [in, unique] const GUID *pguidVendor, + [in] WICDecodeOptions metadataOptions, + [out, retval] IWICBitmapDecoder **ppIDecoder); + + HRESULT CreateComponentInfo( + [in] REFCLSID clsidComponent, + [out] IWICComponentInfo **ppIInfo); + + HRESULT CreateDecoder( + [in] REFGUID guidContainerFormat, + [in, unique] const GUID *pguidVendor, + [out, retval] IWICBitmapDecoder **ppIDecoder); + + HRESULT CreateEncoder( + [in] REFGUID guidContainerFormat, + [in, unique] const GUID *pguidVendor, + [out, retval] IWICBitmapEncoder **ppIEncoder); + + HRESULT CreatePalette( + [out] IWICPalette **ppIPalette); + + HRESULT CreateFormatConverter( + [out] IWICFormatConverter **ppIFormatConverter); + + HRESULT CreateBitmapScaler( + [out] IWICBitmapScaler **ppIBitmapScaler); + + HRESULT CreateBitmapClipper( + [out] IWICBitmapClipper **ppIBitmapClipper); + + HRESULT CreateBitmapFlipRotator( + [out] IWICBitmapFlipRotator **ppIBitmapFlipRotator); + + HRESULT CreateStream( + [out] IWICStream **ppIWICStream); + + HRESULT CreateColorContext( + [out] IWICColorContext **ppIWICColorContext); + + HRESULT CreateColorTransformer( + [out] IWICColorTransform **ppIWICColorTransform); + + HRESULT CreateBitmap( + [in] UINT uiWidth, + [in] UINT uiHeight, + [in] REFWICPixelFormatGUID pixelFormat, + [in] WICBitmapCreateCacheOption option, + [out] IWICBitmap **ppIBitmap); + + HRESULT CreateBitmapFromSource( + [in] IWICBitmapSource *piBitmapSource, + [in] WICBitmapCreateCacheOption option, + [out] IWICBitmap **ppIBitmap); + + HRESULT CreateBitmapFromSourceRect( + [in] IWICBitmapSource *piBitmapSource, + [in] UINT x, + [in] UINT y, + [in] UINT width, + [in] UINT height, + [out] IWICBitmap **ppIBitmap); + + HRESULT CreateBitmapFromMemory( + [in] UINT uiWidth, + [in] UINT uiHeight, + [in] REFWICPixelFormatGUID pixelFormat, + [in] UINT cbStride, + [in] UINT cbBufferSize, + [in, size_is(cbBufferSize)] BYTE *pbBuffer, + [out] IWICBitmap **ppIBitmap); + + HRESULT CreateBitmapFromHBITMAP( + [in] HBITMAP hBitmap, + [in, unique] HPALETTE hPalette, + [in] WICBitmapAlphaChannelOption options, + [out] IWICBitmap **ppIBitmap); + + HRESULT CreateBitmapFromHICON( + [in] HICON hIcon, + [out] IWICBitmap **ppIBitmap); + + HRESULT CreateComponentEnumerator( + [in] DWORD componentTypes, + [in] DWORD options, + [out] IEnumUnknown **ppIEnumUnknown); + + HRESULT CreateFastMetadataEncoderFromDecoder( + [in] IWICBitmapDecoder *pIDecoder, + [out] IWICFastMetadataEncoder **ppIFastEncoder); + + HRESULT CreateFastMetadataEncoderFromFrameDecode( + [in] IWICBitmapFrameDecode *pIFrameDecoder, + [out] IWICFastMetadataEncoder **ppIFastEncoder); + + HRESULT CreateQueryWriter( + [in] REFGUID guidMetadataFormat, + [in, unique] const GUID *pguidVendor, + [out] IWICMetadataQueryWriter **ppIQueryWriter); + + HRESULT CreateQueryWriterFromReader( + [in] IWICMetadataQueryReader *pIQueryReader, + [in, unique] const GUID *pguidVendor, + [out] IWICMetadataQueryWriter **ppIQueryWriter); +}

1 0

Henri Verbeet : wined3d: Set FBO stencil attachments for relevant depth stencil formats.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 7422babd8824e150167a383d57f03b437324579b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7422babd8824e150167a383d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 8 10:35:06 2009 +0200 wined3d: Set FBO stencil attachments for relevant depth stencil formats. --- dlls/wined3d/context.c | 60 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5c76146..81bddb1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -66,6 +66,9 @@ static void context_clean_fbo_attachments(IWineD3DDeviceImpl *This) } GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); checkGLcall("glFramebufferTexture2D()"); + + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); + checkGLcall("glFramebufferTexture2D()"); } /* GL locking is done by the caller */ @@ -146,7 +149,6 @@ static void context_apply_attachment_filter_states(IWineD3DDevice *iface, IWineD checkGLcall("apply_attachment_filter_states()"); } -/* TODO: Handle stencil attachments */ /* GL locking is done by the caller */ void context_attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer) { @@ -156,20 +158,64 @@ void context_attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_targe if (depth_stencil) { + DWORD format_flags = depth_stencil_impl->resource.format_desc->Flags; + if (use_render_buffer && depth_stencil_impl->current_renderbuffer) { - GL_EXTCALL(glFramebufferRenderbufferEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_stencil_impl->current_renderbuffer->id)); - checkGLcall("glFramebufferRenderbufferEXT()"); - } else { + if (format_flags & WINED3DFMT_FLAG_DEPTH) + { + GL_EXTCALL(glFramebufferRenderbufferEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, depth_stencil_impl->current_renderbuffer->id)); + checkGLcall("glFramebufferRenderbufferEXT()"); + } + + if (format_flags & WINED3DFMT_FLAG_STENCIL) + { + GL_EXTCALL(glFramebufferRenderbufferEXT(fbo_target, GL_STENCIL_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, depth_stencil_impl->current_renderbuffer->id)); + checkGLcall("glFramebufferRenderbufferEXT()"); + } + } + else + { context_apply_attachment_filter_states((IWineD3DDevice *)This, depth_stencil, TRUE); - GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, depth_stencil_impl->glDescription.target, - depth_stencil_impl->glDescription.textureName, depth_stencil_impl->glDescription.level)); + if (format_flags & WINED3DFMT_FLAG_DEPTH) + { + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, + depth_stencil_impl->glDescription.target, depth_stencil_impl->glDescription.textureName, + depth_stencil_impl->glDescription.level)); + checkGLcall("glFramebufferTexture2DEXT()"); + } + + if (format_flags & WINED3DFMT_FLAG_STENCIL) + { + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_STENCIL_ATTACHMENT_EXT, + depth_stencil_impl->glDescription.target, depth_stencil_impl->glDescription.textureName, + depth_stencil_impl->glDescription.level)); + checkGLcall("glFramebufferTexture2DEXT()"); + } + } + + if (!(format_flags & WINED3DFMT_FLAG_DEPTH)) + { + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); checkGLcall("glFramebufferTexture2DEXT()"); } - } else { + + if (!(format_flags & WINED3DFMT_FLAG_STENCIL)) + { + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_STENCIL_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); + checkGLcall("glFramebufferTexture2DEXT()"); + } + } + else + { GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); checkGLcall("glFramebufferTexture2DEXT()"); + + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_STENCIL_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); + checkGLcall("glFramebufferTexture2DEXT()"); } }

1 0

Vincent Povirk : windowscodecs: Add stub dll.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: ed4cde25cc6796c6deb82f8f09e2ef4aa49d6207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4cde25cc6796c6deb82f8f0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 28 13:36:54 2009 -0500 windowscodecs: Add stub dll. --- configure | 9 +++ configure.ac | 1 + dlls/windowscodecs/Makefile.in | 13 ++++ dlls/windowscodecs/main.c | 42 ++++++++++++ dlls/windowscodecs/windowscodecs.spec | 114 +++++++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 91f6a88..39fd94f 100755 --- a/configure +++ b/configure @@ -27257,6 +27257,14 @@ dlls/windebug.dll16/Makefile: dlls/windebug.dll16/Makefile.in dlls/Makedll.rules ac_config_files="$ac_config_files dlls/windebug.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/windowscodecs/Makefile" +test "x$enable_windowscodecs" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + windowscodecs" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/windowscodecs/Makefile: dlls/windowscodecs/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/windowscodecs/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winealsa.drv/Makefile" test "x$enable_winealsa_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ winealsa.drv" @@ -29239,6 +29247,7 @@ do "dlls/win87em.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win87em.dll16/Makefile" ;; "dlls/winaspi.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winaspi.dll16/Makefile" ;; "dlls/windebug.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/windebug.dll16/Makefile" ;; + "dlls/windowscodecs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/windowscodecs/Makefile" ;; "dlls/winealsa.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winealsa.drv/Makefile" ;; "dlls/wineaudioio.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wineaudioio.drv/Makefile" ;; "dlls/winecoreaudio.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winecoreaudio.drv/Makefile" ;; diff --git a/configure.ac b/configure.ac index 001c312..99a60bc 100644 --- a/configure.ac +++ b/configure.ac @@ -2285,6 +2285,7 @@ WINE_CONFIG_MAKEFILE([dlls/win32s16.dll16/Makefile],[dlls/Makedll.rules],[dlls], WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/winaspi.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/windebug.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) +WINE_CONFIG_MAKEFILE([dlls/windowscodecs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/winealsa.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wineaudioio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/winecoreaudio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in new file mode 100644 index 0000000..1449089 --- /dev/null +++ b/dlls/windowscodecs/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = windowscodecs.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c new file mode 100644 index 0000000..e3912b8 --- /dev/null +++ b/dlls/windowscodecs/main.c @@ -0,0 +1,42 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec new file mode 100644 index 0000000..8fc2026 --- /dev/null +++ b/dlls/windowscodecs/windowscodecs.spec @@ -0,0 +1,114 @@ +@ stub DllGetClassObject +@ stub IEnumString_Next_WIC_Proxy +@ stub IEnumString_Reset_WIC_Proxy +@ stub IPropertyBag2_Write_Proxy +@ stub IWICBitmapClipper_Initialize_Proxy +@ stub IWICBitmapCodecInfo_DoesSupportAnimation_Proxy +@ stub IWICBitmapCodecInfo_DoesSupportLossless_Proxy +@ stub IWICBitmapCodecInfo_DoesSupportMultiframe_Proxy +@ stub IWICBitmapCodecInfo_GetContainerFormat_Proxy +@ stub IWICBitmapCodecInfo_GetDeviceManufacturer_Proxy +@ stub IWICBitmapCodecInfo_GetDeviceModels_Proxy +@ stub IWICBitmapCodecInfo_GetFileExtensions_Proxy +@ stub IWICBitmapCodecInfo_GetMimeTypes_Proxy +@ stub IWICBitmapDecoder_CopyPalette_Proxy +@ stub IWICBitmapDecoder_GetColorContexts_Proxy +@ stub IWICBitmapDecoder_GetDecoderInfo_Proxy +@ stub IWICBitmapDecoder_GetFrameCount_Proxy +@ stub IWICBitmapDecoder_GetFrame_Proxy +@ stub IWICBitmapDecoder_GetMetadataQueryReader_Proxy +@ stub IWICBitmapDecoder_GetPreview_Proxy +@ stub IWICBitmapDecoder_GetThumbnail_Proxy +@ stub IWICBitmapEncoder_Commit_Proxy +@ stub IWICBitmapEncoder_CreateNewFrame_Proxy +@ stub IWICBitmapEncoder_GetEncoderInfo_Proxy +@ stub IWICBitmapEncoder_GetMetadataQueryWriter_Proxy +@ stub IWICBitmapEncoder_Initialize_Proxy +@ stub IWICBitmapEncoder_SetPalette_Proxy +@ stub IWICBitmapEncoder_SetThumbnail_Proxy +@ stub IWICBitmapFlipRotator_Initialize_Proxy +@ stub IWICBitmapFrameDecode_GetColorContexts_Proxy +@ stub IWICBitmapFrameDecode_GetMetadataQueryReader_Proxy +@ stub IWICBitmapFrameDecode_GetThumbnail_Proxy +@ stub IWICBitmapFrameEncode_Commit_Proxy +@ stub IWICBitmapFrameEncode_GetMetadataQueryWriter_Proxy +@ stub IWICBitmapFrameEncode_Initialize_Proxy +@ stub IWICBitmapFrameEncode_SetColorContexts_Proxy +@ stub IWICBitmapFrameEncode_SetResolution_Proxy +@ stub IWICBitmapFrameEncode_SetSize_Proxy +@ stub IWICBitmapFrameEncode_SetThumbnail_Proxy +@ stub IWICBitmapFrameEncode_WriteSource_Proxy +@ stub IWICBitmapLock_GetDataPointer_STA_Proxy +@ stub IWICBitmapLock_GetStride_Proxy +@ stub IWICBitmapScaler_Initialize_Proxy +@ stub IWICBitmapSource_CopyPalette_Proxy +@ stub IWICBitmapSource_CopyPixels_Proxy +@ stub IWICBitmapSource_GetPixelFormat_Proxy +@ stub IWICBitmapSource_GetResolution_Proxy +@ stub IWICBitmapSource_GetSize_Proxy +@ stub IWICBitmap_Lock_Proxy +@ stub IWICBitmap_SetPalette_Proxy +@ stub IWICBitmap_SetResolution_Proxy +@ stub IWICColorContext_InitializeFromMemory_Proxy +@ stub IWICComponentFactory_CreateMetadataWriterFromReader_Proxy +@ stub IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy +@ stub IWICComponentInfo_GetAuthor_Proxy +@ stub IWICComponentInfo_GetCLSID_Proxy +@ stub IWICComponentInfo_GetFriendlyName_Proxy +@ stub IWICComponentInfo_GetSpecVersion_Proxy +@ stub IWICComponentInfo_GetVersion_Proxy +@ stub IWICFastMetadataEncoder_Commit_Proxy +@ stub IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy +@ stub IWICFormatConverter_Initialize_Proxy +@ stub IWICImagingFactory_CreateBitmapClipper_Proxy +@ stub IWICImagingFactory_CreateBitmapFlipRotator_Proxy +@ stub IWICImagingFactory_CreateBitmapFromHBITMAP_Proxy +@ stub IWICImagingFactory_CreateBitmapFromHICON_Proxy +@ stub IWICImagingFactory_CreateBitmapFromMemory_Proxy +@ stub IWICImagingFactory_CreateBitmapFromSource_Proxy +@ stub IWICImagingFactory_CreateBitmapScaler_Proxy +@ stub IWICImagingFactory_CreateBitmap_Proxy +@ stub IWICImagingFactory_CreateComponentInfo_Proxy +@ stub IWICImagingFactory_CreateDecoderFromFileHandle_Proxy +@ stub IWICImagingFactory_CreateDecoderFromFilename_Proxy +@ stub IWICImagingFactory_CreateDecoderFromStream_Proxy +@ stub IWICImagingFactory_CreateEncoder_Proxy +@ stub IWICImagingFactory_CreateFastMetadataEncoderFromDecoder_Proxy +@ stub IWICImagingFactory_CreateFastMetadataEncoderFromFrameDecode_Proxy +@ stub IWICImagingFactory_CreateFormatConverter_Proxy +@ stub IWICImagingFactory_CreatePalette_Proxy +@ stub IWICImagingFactory_CreateQueryWriterFromReader_Proxy +@ stub IWICImagingFactory_CreateQueryWriter_Proxy +@ stub IWICImagingFactory_CreateStream_Proxy +@ stub IWICMetadataBlockReader_GetCount_Proxy +@ stub IWICMetadataBlockReader_GetReaderByIndex_Proxy +@ stub IWICMetadataQueryReader_GetContainerFormat_Proxy +@ stub IWICMetadataQueryReader_GetEnumerator_Proxy +@ stub IWICMetadataQueryReader_GetLocation_Proxy +@ stub IWICMetadataQueryReader_GetMetadataByName_Proxy +@ stub IWICMetadataQueryWriter_RemoveMetadataByName_Proxy +@ stub IWICMetadataQueryWriter_SetMetadataByName_Proxy +@ stub IWICPalette_GetColorCount_Proxy +@ stub IWICPalette_GetColors_Proxy +@ stub IWICPalette_GetType_Proxy +@ stub IWICPalette_HasAlpha_Proxy +@ stub IWICPalette_InitializeCustom_Proxy +@ stub IWICPalette_InitializeFromBitmap_Proxy +@ stub IWICPalette_InitializeFromPalette_Proxy +@ stub IWICPalette_InitializePredefined_Proxy +@ stub IWICPixelFormatInfo_GetBitsPerPixel_Proxy +@ stub IWICPixelFormatInfo_GetChannelCount_Proxy +@ stub IWICPixelFormatInfo_GetChannelMask_Proxy +@ stub IWICStream_InitializeFromIStream_Proxy +@ stub IWICStream_InitializeFromMemory_Proxy +@ stub WICConvertBitmapSource +@ stub WICCreateBitmapFromSection +@ stub WICCreateColorContext_Proxy +@ stub WICCreateImagingFactory_Proxy +@ stub WICGetMetadataContentSize +@ stub WICMapGuidToShortName +@ stub WICMapSchemaToName +@ stub WICMapShortNameToGuid +@ stub WICMatchMetadataContent +@ stub WICSerializeMetadataContent +@ stub WICSetEncoderFormat_Proxy

1 0

Henri Verbeet : wined3d: Use context_attach_depth_stencil_fbo() to clear FBO depth attachments.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: a2244051ef3d5aabf4a5c102b457c2abce5175e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2244051ef3d5aabf4a5c102b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 8 10:35:05 2009 +0200 wined3d: Use context_attach_depth_stencil_fbo() to clear FBO depth attachments. --- dlls/wined3d/context.c | 3 +-- dlls/wined3d/device.c | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ba1e100..5c76146 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1660,8 +1660,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU ENTER_GL(); context_bind_fbo((IWineD3DDevice *)This, GL_FRAMEBUFFER_EXT, &context->dst_fbo); context_attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, 0, target); - GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); - checkGLcall("glFramebufferRenderbufferEXT"); + context_attach_depth_stencil_fbo(This, GL_FRAMEBUFFER_EXT, NULL, FALSE); LEAVE_GL(); } else { ENTER_GL(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f1dd938..16e4062 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6176,8 +6176,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, ENTER_GL(); context_bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->activeContext->dst_fbo); context_attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, 0, surface); - GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); - checkGLcall("glFramebufferRenderbufferEXT"); + context_attach_depth_stencil_fbo(This, GL_FRAMEBUFFER_EXT, NULL, FALSE); } if (rect) { @@ -6596,8 +6595,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED context_attach_surface_fbo(This, GL_READ_FRAMEBUFFER_EXT, 0, src_surface); glReadBuffer(GL_COLOR_ATTACHMENT0_EXT); checkGLcall("glReadBuffer()"); - GL_EXTCALL(glFramebufferRenderbufferEXT(GL_READ_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); - checkGLcall("glFramebufferRenderbufferEXT"); + context_attach_depth_stencil_fbo(This, GL_READ_FRAMEBUFFER_EXT, NULL, FALSE); } LEAVE_GL(); @@ -6644,8 +6642,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED context_attach_surface_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, 0, dst_surface); glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); checkGLcall("glDrawBuffer()"); - GL_EXTCALL(glFramebufferRenderbufferEXT(GL_DRAW_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); - checkGLcall("glFramebufferRenderbufferEXT"); + context_attach_depth_stencil_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, NULL, FALSE); } glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE));

1 0

Paul Vriens : kernel32/tests: Only report unimplemented functions once.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 06ebe936aca9fc4a81366f422a55dc99419554af URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ebe936aca9fc4a81366f422… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 8 10:28:03 2009 +0200 kernel32/tests: Only report unimplemented functions once. --- dlls/kernel32/tests/comm.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 8cd07ad..2fb95cd 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -561,6 +561,7 @@ static void test_BuildCommDCBW(TEST *ptest, int initial_value, DCB *pexpected_dc BOOL result; DCB dcb; WCHAR wide_string[sizeof(ptest->string)]; + static int reportedDCBW = 0; MultiByteToWideChar(CP_ACP, 0, ptest->string, -1, wide_string, sizeof(wide_string) / sizeof(WCHAR)); @@ -572,7 +573,8 @@ static void test_BuildCommDCBW(TEST *ptest, int initial_value, DCB *pexpected_dc if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - win_skip("BuildCommDCBW is not available\n"); + if(!reportedDCBW++) + win_skip("BuildCommDCBW is not implemented\n"); return; } @@ -587,6 +589,7 @@ static void test_BuildCommDCBAndTimeoutsW(TEST *ptest, int initial_value, DCB *p DCB dcb; COMMTIMEOUTS timeouts; WCHAR wide_string[sizeof(ptest->string)]; + static int reportedDCBAndTW = 0; MultiByteToWideChar(CP_ACP, 0, ptest->string, -1, wide_string, sizeof(wide_string) / sizeof(WCHAR)); @@ -599,14 +602,15 @@ static void test_BuildCommDCBAndTimeoutsW(TEST *ptest, int initial_value, DCB *p if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - win_skip("BuildCommDCBAndTimeoutsW is not available\n"); + if(!reportedDCBAndTW++) + win_skip("BuildCommDCBAndTimeoutsW is not implemented\n"); return; } /* check results */ - check_result("BuildCommDCBAndTimeoutsA", ptest, initial_value, result); - check_dcb("BuildCommDCBAndTimeoutsA", ptest, initial_value, &dcb, pexpected_dcb); - check_timeouts("BuildCommDCBAndTimeoutsA", ptest, initial_value, &timeouts, pexpected_timeouts); + check_result("BuildCommDCBAndTimeoutsW", ptest, initial_value, result); + check_dcb("BuildCommDCBAndTimeoutsW", ptest, initial_value, &dcb, pexpected_dcb); + check_timeouts("BuildCommDCBAndTimeoutsW", ptest, initial_value, &timeouts, pexpected_timeouts); } static void test_BuildCommDCB(void)

1 0

Henri Verbeet : wined3d: Use GL_DEPTH_COMPONENT32F for WINED3DFMT_D32F_LOCKABLE.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 4bc21808210c9cbfc48f8ccf74785f4d3f080bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc21808210c9cbfc48f8ccf7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 8 10:35:05 2009 +0200 wined3d: Use GL_DEPTH_COMPONENT32F for WINED3DFMT_D32F_LOCKABLE. --- dlls/wined3d/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 00f67d0..29f40a4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -446,10 +446,10 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_LUMINANCE, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, - {WINED3DFMT_D32F_LOCKABLE, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, + {WINED3DFMT_D32F_LOCKABLE, GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT32F, 0, GL_DEPTH_COMPONENT, GL_FLOAT, WINED3DFMT_FLAG_DEPTH, - ARB_DEPTH_TEXTURE}, + ARB_DEPTH_BUFFER_FLOAT}, {WINED3DFMT_D24FS8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_FLOAT, WINED3DFMT_FLAG_DEPTH,

1 0