wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Nikolay Sivov : msxml6: Add stub msxml6, forward DOMDocument60 creation to msxml3.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 25bce451af3d6c9b9608251993912e7423ede5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bce451af3d6c9b960825199… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 01:31:07 2010 +0400 msxml6: Add stub msxml6, forward DOMDocument60 creation to msxml3. --- configure | 1 + configure.ac | 1 + dlls/msxml3/factory.c | 13 +- dlls/msxml3/uuid.c | 1 + dlls/msxml6/Makefile.in | 13 ++ dlls/msxml6/main.c | 39 +++++ dlls/msxml6/msxml6.spec | 4 + dlls/msxml6/regsvr.c | 407 +++++++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 9 files changed, 475 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25bce451af3d6c9b96082…

1 0

Nikolay Sivov : include: Add xml DOMDocument60 definition.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 3780b082398a7d324729a9dbde411157286d3c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3780b082398a7d324729a9dbd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 01:29:29 2010 +0400 include: Add xml DOMDocument60 definition. --- .gitignore | 1 + include/Makefile.in | 2 + include/msxml6.idl | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/msxml6did.h | 27 +++++++++++++++++++++++ 4 files changed, 90 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a007dcc..d009da6 100644 --- a/.gitignore +++ b/.gitignore @@ -189,6 +189,7 @@ include/msinkaut.h include/mstask.h include/msxml.h include/msxml2.h +include/msxml6.h include/netcon.h include/netfw.h include/oaidl.h diff --git a/include/Makefile.in b/include/Makefile.in index b8d26ec..c454490 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -61,6 +61,7 @@ PUBLIC_IDL_H_SRCS = \ mstask.idl \ msxml.idl \ msxml2.idl \ + msxml6.idl \ netcon.idl \ netfw.idl \ oaidl.idl \ @@ -379,6 +380,7 @@ SRCDIR_INCLUDES = \ msvcrt/wctype.h \ mswsock.h \ msxml2did.h \ + msxml6did.h \ msxmldid.h \ nb30.h \ ndrtypes.h \ diff --git a/include/msxml6.idl b/include/msxml6.idl new file mode 100644 index 0000000..59c9d6d --- /dev/null +++ b/include/msxml6.idl @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2010 Nikolay Sivov 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 <msxml6did.h> +import "msxml2.idl"; + +[ + uuid(88d96a05-f192-11d4-a65f-0040963251e5) +] +coclass DOMDocument60 +{ + [default] interface IXMLDOMDocument3; + [default, source] dispinterface XMLDOMDocumentEvents; +} + +[ + uuid(88d96a06-f192-11d4-a65f-0040963251e5), +] +coclass FreeThreadedDOMDocument60 +{ + [default] interface IXMLDOMDocument3; + [default, source] dispinterface XMLDOMDocumentEvents; +} + +[ + local, + object, + dual, + uuid(2933bf96-7b36-11d2-b20e-00c04f983e60), + oleautomation, +] +interface IXMLDOMDocument3 : IXMLDOMDocument2 +{ + [id(DISPID_XMLDOM_DOCUMENT3_VALIDATENODE)] + HRESULT validateNode( + [in] IXMLDOMNode *node, + [out, retval] IXMLDOMParseError **error); + + [id(DISPID_XMLDOM_DOCUMENT3_IMPORTNODE)] + HRESULT importNode( + [in] IXMLDOMNode *node, + [in] VARIANT_BOOL deep, + [out, retval] IXMLDOMNode **clone); +} diff --git a/include/msxml6did.h b/include/msxml6did.h new file mode 100644 index 0000000..192976f --- /dev/null +++ b/include/msxml6did.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2010 Nikolay Sivov 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 + */ + +#ifndef __MSXML6DID_H__ +#define __MSXML6DID_H__ + +#define DISPID_XMLDOM_DOCUMENT3 0x000000ce +#define DISPID_XMLDOM_DOCUMENT3_VALIDATENODE 0x000000cf +#define DISPID_XMLDOM_DOCUMENT3_IMPORTNODE 0x000000d0 +#define DISPID_XMLDOM_DOCUMENT3__TOP 0x000000d1 + +#endif /* __MSXML6DID_H__ */

1 0

Francois Gouget : d3dcompiler_43: Don' t use nameless unions in our private structures to avoid trouble with compilers where they are not supported .
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: aaf78f1a0b63d0a6c5c11f9ef8bf0dbc7d0cb427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf78f1a0b63d0a6c5c11f9ef… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 29 23:40:33 2010 +0200 d3dcompiler_43: Don't use nameless unions in our private structures to avoid trouble with compilers where they are not supported. --- dlls/d3dcompiler_43/asmparser.c | 24 ++++++++-------- dlls/d3dcompiler_43/asmshader.y | 34 +++++++++++----------- dlls/d3dcompiler_43/asmutils.c | 32 +++++++++++----------- dlls/d3dcompiler_43/bytecodewriter.c | 42 ++++++++++++++-------------- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- 5 files changed, 67 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaf78f1a0b63d0a6c5c11…

1 0

Francois Gouget : winex11.drv: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: e7fbc9dece1808d277ea62afe669a192ea374d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fbc9dece1808d277ea62afe… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 29 23:40:21 2010 +0200 winex11.drv: Fix compilation on systems that don't support nameless unions. --- dlls/winex11.drv/xdnd.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 526066f..de689fd 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -29,6 +29,8 @@ #include <stdarg.h> #include <stdio.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -996,10 +998,10 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, if (current->cf_win == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->hGlobal = HeapAlloc(GetProcessHeap(), 0, current->size); - if (pMedium->hGlobal == NULL) + pMedium->u.hGlobal = HeapAlloc(GetProcessHeap(), 0, current->size); + if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(pMedium->hGlobal, current->data, current->size); + memcpy(pMedium->u.hGlobal, current->data, current->size); pMedium->pUnkForRelease = 0; return S_OK; }

1 0

Francois Gouget : shell32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 6f1326fac162afc62d4c1be1772ab9075b77a812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1326fac162afc62d4c1be17… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 29 23:39:55 2010 +0200 shell32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/shell32/tests/shlfolder.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 34bf59d..e766adf 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3652,13 +3652,13 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) ok_(__FILE__,l)(filename.uType == STRRET_WSTR || filename.uType == STRRET_CSTR, "Got unexpected string type: %d\n", filename.uType); if(filename.uType == STRRET_WSTR){ - ok_(__FILE__,l)(lstrcmpW(path, filename.pOleStr) == 0, + ok_(__FILE__,l)(lstrcmpW(path, U(filename).pOleStr) == 0, "didn't get expected path (%s), instead: %s\n", - wine_dbgstr_w(path), wine_dbgstr_w(filename.pOleStr)); + wine_dbgstr_w(path), wine_dbgstr_w(U(filename).pOleStr)); }else if(filename.uType == STRRET_CSTR){ - ok_(__FILE__,l)(strcmp_wa(path, filename.cStr) == 0, + ok_(__FILE__,l)(strcmp_wa(path, U(filename).cStr) == 0, "didn't get expected path (%s), instead: %s\n", - wine_dbgstr_w(path), filename.cStr); + wine_dbgstr_w(path), U(filename).cStr); } IShellFolder_Release(parent);

1 0

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: b462bc223a6f90d1896c9769fd2bc07f15d54e43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b462bc223a6f90d1896c9769f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 29 23:38:51 2010 +0200 oleaut32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/oleaut32/tests/typelib.c | 94 ++++++++++++++++++++-------------------- 1 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b462bc223a6f90d1896c9…

1 0

Francois Gouget : d3d9/tests: Fix compilation on systems that don' t support nameless unions or structs.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 45ea56ffb45278930a07f1bd21d1ad6953ebe1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ea56ffb45278930a07f1bd2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 29 23:38:14 2010 +0200 d3d9/tests: Fix compilation on systems that don't support nameless unions or structs. --- dlls/d3d9/tests/d3d9ex.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 6e11116..090ecfc 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -269,7 +269,7 @@ static void test_get_adapter_displaymode_ex(void) memset(&startmode, 0, sizeof(startmode)); startmode.dmSize = sizeof(startmode); startmode.dmFields = DM_DISPLAYORIENTATION; - startmode.dmDisplayOrientation = DMDO_180; + S2(U1(startmode)).dmDisplayOrientation = DMDO_180; retval = pChangeDisplaySettingsExA(NULL, &startmode, NULL, 0, NULL); @@ -282,7 +282,7 @@ static void test_get_adapter_displaymode_ex(void) ok(retval == DISP_CHANGE_SUCCESSFUL,"ChangeDisplaySettingsEx failed with %d\n", retval); /* try retrieve orientation info with EnumDisplaySettingsEx*/ startmode.dmFields = 0; - startmode.dmDisplayOrientation = 0; + S2(U1(startmode)).dmDisplayOrientation = 0; ok(pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed\n"); /*now that orientation has changed start tests for GetAdapterDisplayModeEx: invalid Size*/ @@ -310,7 +310,7 @@ static void test_get_adapter_displaymode_ex(void) /* don't know yet how to test for ScanLineOrdering, just testing that it is set to a value by GetAdapterDisplayModeEx*/ todo_wine ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* check that orientation is returned correctly by GetAdapterDisplayModeEx and EnumDisplaySettingsEx*/ - todo_wine ok(startmode.dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, startmode.dmDisplayOrientation); + todo_wine ok(S2(U1(startmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, S2(U1(startmode)).dmDisplayOrientation); trace("GetAdapterDisplayModeEx returned Width = %d,Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation);

1 0

Henri Verbeet : wined3d: Use surface_color_fill() in IWineD3DDeviceImpl_ClearRendertargetView().
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 0a28300c49bc987f0b08cfe8b648933fcb710dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a28300c49bc987f0b08cfe8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 29 21:57:44 2010 +0200 wined3d: Use surface_color_fill() in IWineD3DDeviceImpl_ClearRendertargetView(). --- dlls/wined3d/device.c | 27 ++------------------------- 1 files changed, 2 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cac6830..a90ad80 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5518,7 +5518,6 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac IWineD3DRendertargetView *rendertarget_view, const WINED3DCOLORVALUE *color) { IWineD3DResource *resource; - IWineD3DSurfaceImpl *surface; HRESULT hr; hr = IWineD3DRendertargetView_GetResource(rendertarget_view, &resource); @@ -5535,30 +5534,8 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac return; } - surface = (IWineD3DSurfaceImpl *)resource; - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - const RECT draw_rect = {0, 0, surface->currentDesc.Width, surface->currentDesc.Height}; - - device_clear_render_targets((IWineD3DDeviceImpl *)iface, 1, &surface, - 0, NULL, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); - } - else - { - WINEDDBLTFX BltFx; - - /* Just forward this to the DirectDraw blitting engine */ - memset(&BltFx, 0, sizeof(BltFx)); - BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = wined3d_format_convert_from_float(surface->resource.format_desc, color); - hr = IWineD3DSurface_Blt((IWineD3DSurface *)surface, NULL, NULL, NULL, - WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); - if (FAILED(hr)) - { - ERR("Blt failed, hr %#x\n", hr); - } - } + hr = surface_color_fill((IWineD3DSurfaceImpl *)resource, NULL, color); + if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr); IWineD3DResource_Release(resource); }

1 0

Henri Verbeet : wined3d: Use surface_color_fill() in IWineD3DDeviceImpl_ColorFill().
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: c689280beb52c8f44b59978c20af4080238fd467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c689280beb52c8f44b59978c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 29 21:57:43 2010 +0200 wined3d: Use surface_color_fill() in IWineD3DDeviceImpl_ColorFill(). --- dlls/wined3d/device.c | 18 +----------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6deb552..cac6830 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5500,7 +5500,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *surface, const WINED3DRECT *pRect, const WINED3DCOLORVALUE *color) { IWineD3DSurfaceImpl *s = (IWineD3DSurfaceImpl *)surface; - WINEDDBLTFX BltFx; TRACE("iface %p, surface %p, rect %s, color {%.8e, %.8e, %.8e, %.8e}.\n", iface, surface, wine_dbgstr_rect((const RECT *)pRect), @@ -5512,22 +5511,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, return WINED3DERR_INVALIDCALL; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - const RECT draw_rect = {0, 0, s->currentDesc.Width, s->currentDesc.Height}; - - return device_clear_render_targets((IWineD3DDeviceImpl *)iface, 1, &s, - !!pRect, (const RECT *)pRect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); - } - else - { - /* Just forward this to the DirectDraw blitting engine */ - memset(&BltFx, 0, sizeof(BltFx)); - BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = wined3d_format_convert_from_float(s->resource.format_desc, color); - return IWineD3DSurface_Blt(surface, (const RECT *)pRect, NULL, NULL, - WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); - } + return surface_color_fill(s, (const RECT *)pRect, color); } static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *iface, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6dcd590..9e4fc7c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3354,7 +3354,7 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT context_release(context); } -static HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) +HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) { IWineD3DDeviceImpl *device = s->resource.device; const struct blit_shader *blitter; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb743ae..e0a4dd4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2092,6 +2092,7 @@ extern const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl DECLSPEC_HIDDEN; extern const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl DECLSPEC_HIDDEN; void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; +HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN; void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT alignment,

1 0

Henri Verbeet : wined3d: Introduce surface_color_fill().
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: ecc67757ab2aa771a46362d40ba141d007c25f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc67757ab2aa771a46362d40… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 29 21:57:42 2010 +0200 wined3d: Introduce surface_color_fill(). This is also a first attempt at a more structured interface to blitter operations. --- dlls/wined3d/surface.c | 32 +++++++++++++++++--------------- dlls/wined3d/utils.c | 23 +++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a669b98..6dcd590 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3354,6 +3354,22 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT context_release(context); } +static HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) +{ + IWineD3DDeviceImpl *device = s->resource.device; + const struct blit_shader *blitter; + + blitter = wined3d_select_blitter(&device->adapter->gl_info, BLIT_OP_COLOR_FILL, + NULL, 0, 0, NULL, rect, s->resource.usage, s->resource.pool, s->resource.format_desc); + if (!blitter) + { + FIXME("No blitter is capable of performing the requested color fill operation.\n"); + return WINED3DERR_INVALIDCALL; + } + + return blitter->color_fill(device, s, rect, color); +} + /* Not called from the VTable */ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, const RECT *DestRect, IWineD3DSurfaceImpl *src_surface, const RECT *SrcRect, DWORD Flags, const WINEDDBLTFX *DDBltFx, @@ -3737,21 +3753,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, if (!surface_convert_color_to_float(dst_surface, DDBltFx->u5.dwFillColor, &color)) return WINED3DERR_INVALIDCALL; - if (ffp_blit.blit_supported(gl_info, BLIT_OP_COLOR_FILL, - NULL, 0, 0, NULL, - &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, - dst_surface->resource.format_desc)) - { - return ffp_blit.color_fill(device, dst_surface, &dst_rect, &color); - } - else if (cpu_blit.blit_supported(gl_info, BLIT_OP_COLOR_FILL, - NULL, 0, 0, NULL, - &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, - dst_surface->resource.format_desc)) - { - return cpu_blit.color_fill(device, dst_surface, &dst_rect, &color); - } - return WINED3DERR_INVALIDCALL; + return surface_color_fill(dst_surface, &dst_rect, &color); } } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b386db4..1c414e9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3136,3 +3136,26 @@ void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, else if (gl_info->supported[ATI_FRAGMENT_SHADER]) *ps_selected = SHADER_ATI; else *ps_selected = SHADER_NONE; } + +const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op, + const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, const struct wined3d_format_desc *src_format, + const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, const struct wined3d_format_desc *dst_format) +{ + static const struct blit_shader * const blitters[] = + { + &arbfp_blit, + &ffp_blit, + &cpu_blit, + }; + unsigned int i; + + for (i = 0; i < sizeof(blitters) / sizeof(*blitters); ++i) + { + if (blitters[i]->blit_supported(gl_info, blit_op, + src_rect, src_usage, src_pool, src_format, + dst_rect, dst_usage, dst_pool, dst_format)) + return blitters[i]; + } + + return NULL; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b9a1f81..cb743ae 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1151,6 +1151,11 @@ extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; extern const struct blit_shader arbfp_blit DECLSPEC_HIDDEN; extern const struct blit_shader cpu_blit DECLSPEC_HIDDEN; +const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op, + const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, const struct wined3d_format_desc *src_format, + const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, const struct wined3d_format_desc *dst_format) + DECLSPEC_HIDDEN; + /* Temporary blit_shader helper functions */ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect_in, enum blit_operation blit_op,

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
89
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 August 2010