August 2010 - Wine-commits - list.winehq.org

Francois Gouget : d3dx9_36: Make {is,make}_pow2() static.
by Alexandre Julliard 26 Aug '10

26 Aug '10

Module: wine Branch: master Commit: 2f8f70bca77a5b03d662392c1816362484031a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8f70bca77a5b03d662392c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:01:09 2010 +0200 d3dx9_36: Make {is,make}_pow2() static. --- dlls/d3dx9_36/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8992399..8895a8f 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -24,13 +24,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /* Returns TRUE if num is a power of 2, FALSE if not, or if 0 */ -BOOL is_pow2(UINT num) +static BOOL is_pow2(UINT num) { return !(num & (num - 1)); } /* Returns the smallest power of 2 which is greater than or equal to num */ -UINT make_pow2(UINT num) +static UINT make_pow2(UINT num) { UINT result = 1;

1 0

Francois Gouget : d3dxof: Make debugstr_fourcc() static.
by Alexandre Julliard 26 Aug '10

26 Aug '10

Module: wine Branch: master Commit: 537d93326ecef49cd7360b05aac56dab167f5c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=537d93326ecef49cd7360b05a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:01:14 2010 +0200 d3dxof: Make debugstr_fourcc() static. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index bfa761b..51fc14b 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -58,7 +58,7 @@ static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** pp static HRESULT IDirectXFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj); /* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc(DWORD fourcc) +static const char *debugstr_fourcc(DWORD fourcc) { if (!fourcc) return "'null'"; return wine_dbg_sprintf ("\'%c%c%c%c\'",

1 0

Francois Gouget : shell32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 26 Aug '10

26 Aug '10

Module: wine Branch: master Commit: 87591917cef89aa21419877ea1f4c19122116ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87591917cef89aa21419877ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:01:24 2010 +0200 shell32/tests: Add a trailing '\n' to an ok() call. --- dlls/shell32/tests/ebrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index e98ced6..6f50b0a 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -962,7 +962,7 @@ static void test_Advise(void) ok(ebev.ref == 0, "Got %d\n", ebev.ref); ref = IExplorerBrowser_Release(peb); - ok(!ref, "Got %d", ref); + ok(!ref, "Got %d\n", ref); } /* Based on PathAddBackslashW from dlls/shlwapi/path.c */

1 0

Francois Gouget : msxml3: Make parse_xml() static.
by Alexandre Julliard 26 Aug '10

26 Aug '10

Module: wine Branch: master Commit: 2dbe80bb7e88ff6f464b4caaeb58c6f4a1430f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbe80bb7e88ff6f464b4caae… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:02:36 2010 +0200 msxml3: Make parse_xml() static. --- dlls/msxml3/msxml_private.h | 1 - dlls/msxml3/xmldoc.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index e0279f1..5fbedf9 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -139,7 +139,6 @@ extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own ); -extern xmlDocPtr parse_xml(char *ptr, int len); /* IXMLDOMNode Internal Structure */ typedef struct _xmlnode diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index d1a010f..af183c9 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -591,7 +591,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty( return E_NOTIMPL; } -xmlDocPtr parse_xml(char *ptr, int len) +static xmlDocPtr parse_xml(char *ptr, int len) { #ifdef HAVE_XMLREADMEMORY return xmlReadMemory(ptr, len, NULL, NULL,

1 0

Jacek Caban : mshtml: Get rid of no longer needed nsIComponentRegistrar:: AutoRegister call.
by Alexandre Julliard 26 Aug '10

26 Aug '10

Module: wine Branch: master Commit: 69637dbed646a78f60024fc24139ceb854ed0ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69637dbed646a78f60024fc24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 25 20:25:06 2010 +0200 mshtml: Get rid of no longer needed nsIComponentRegistrar::AutoRegister call. --- dlls/mshtml/nsembed.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index efc129b..78aab5b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -546,15 +546,10 @@ static BOOL init_xpcom(const PRUnichar *gre_path) ERR("Could not get nsIComponentManager: %08x\n", nsres); nsres = NS_GetComponentRegistrar(&registrar); - if(NS_SUCCEEDED(nsres)) { - nsres = nsIComponentRegistrar_AutoRegister(registrar, NULL); - if(NS_FAILED(nsres)) - ERR("AutoRegister(NULL) failed: %08x\n", nsres); - + if(NS_SUCCEEDED(nsres)) init_nsio(pCompMgr, registrar); - }else { + else ERR("NS_GetComponentRegistrar failed: %08x\n", nsres); - } nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_APPSTARTUPNOTIFIER_CONTRACTID, NULL, &IID_nsIObserver, (void**)&pStartNotif);

1 0

Henri Verbeet : wined3d: Don' t set a NULL container of type WINED3D_CONTAINER_TEXTURE.
by Alexandre Julliard 26 Aug '10

26 Aug '10

Module: wine Branch: master Commit: 22428d97e18e76ba76c10df945cf956ab1897101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22428d97e18e76ba76c10df94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 25 20:46:49 2010 +0200 wined3d: Don't set a NULL container of type WINED3D_CONTAINER_TEXTURE. Any container type other than WINED3D_CONTAINER_NONE implies a valid pointer of the specified type. This fixes a regression introduced by 368e5eb87ae983e4ea2f66b3ca2f4154b36bbcda. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 963d132..c3d0976 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5663,7 +5663,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa TRACE("Changing the back buffer from %p to %p.\n", swapchain->back_buffers[0], back_impl); if (swapchain->back_buffers[0]) - surface_set_container(swapchain->back_buffers[0], WINED3D_CONTAINER_TEXTURE, NULL); + surface_set_container(swapchain->back_buffers[0], WINED3D_CONTAINER_NONE, NULL); swapchain->back_buffers[0] = back_impl; if (back_impl) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 662ef7b..93559a1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -96,6 +96,9 @@ void surface_set_container(IWineD3DSurfaceImpl *surface, enum wined3d_container_ { TRACE("surface %p, container %p.\n", surface, container); + if (!container && type != WINED3D_CONTAINER_NONE) + ERR("Setting NULL container of type %#x.\n", type); + if (type == WINED3D_CONTAINER_SWAPCHAIN) { surface->get_drawable_size = get_drawable_size_swapchain;

1 0

Henri Verbeet : wined3d: Remove the GetContainer() methods from the public wined3d interface.
by Alexandre Julliard 26 Aug '10

26 Aug '10

Module: wine Branch: master Commit: 42b814c7d1e0ae27a1d4b18413a295b4b5989201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b814c7d1e0ae27a1d4b1841… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 25 20:46:50 2010 +0200 wined3d: Remove the GetContainer() methods from the public wined3d interface. There's nothing left that uses these. --- dlls/wined3d/surface.c | 1 - dlls/wined3d/surface_base.c | 18 ------------------ dlls/wined3d/surface_gdi.c | 1 - dlls/wined3d/volume.c | 24 ++---------------------- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.idl | 8 -------- 6 files changed, 2 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 93559a1..2be3706 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4719,7 +4719,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_UnLoad, IWineD3DBaseSurfaceImpl_GetType, /* IWineD3DSurface */ - IWineD3DBaseSurfaceImpl_GetContainer, IWineD3DBaseSurfaceImpl_GetDesc, IWineD3DSurfaceImpl_LockRect, IWineD3DSurfaceImpl_UnlockRect, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 6c19218..64c5a28 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -148,24 +148,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface, IUnknow IWineD3DSurface IWineD3DSurface parts follow ****************************************************** */ -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetContainer(IWineD3DSurface* iface, REFIID riid, void** ppContainer) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DBase *container = 0; - - TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); - - if (!ppContainer) { - ERR("Called without a valid ppContainer.\n"); - } - - /* Standalone surfaces return the device as container. */ - if (This->container.u.base) container = This->container.u.base; - else container = (IWineD3DBase *)This->resource.device; - - TRACE("Relaying to QueryInterface\n"); - return IUnknown_QueryInterface(container, riid, ppContainer); -} - HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index bd1b775..68e36ee 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -503,7 +503,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineGDISurfaceImpl_UnLoad, IWineD3DBaseSurfaceImpl_GetType, /* IWineD3DSurface */ - IWineD3DBaseSurfaceImpl_GetContainer, IWineD3DBaseSurfaceImpl_GetDesc, IWineGDISurfaceImpl_LockRect, IWineGDISurfaceImpl_UnlockRect, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index eeb9361..349c7ec 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -184,27 +184,8 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa /* ******************************************* IWineD3DVolume parts follow ******************************************* */ -static HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REFIID riid, void** ppContainer) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - - TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); - - if (!ppContainer) { - ERR("Called without a valid ppContainer.\n"); - return E_FAIL; - } - - /* Although surfaces can be standalone, volumes can't */ - if (!This->container) { - ERR("Volume without an container. Should not happen.\n"); - return E_FAIL; - } - - TRACE("Relaying to QueryInterface\n"); - return IUnknown_QueryInterface((IWineD3DVolumeTexture *)This->container, riid, ppContainer); -} - -static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC* pDesc) { +static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *pDesc) +{ IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); @@ -349,7 +330,6 @@ static const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = IWineD3DVolumeImpl_UnLoad, IWineD3DVolumeImpl_GetType, /* IWineD3DVolume */ - IWineD3DVolumeImpl_GetContainer, IWineD3DVolumeImpl_GetDesc, IWineD3DVolumeImpl_LockBox, IWineD3DVolumeImpl_UnlockBox, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84415d6..22fb79b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2124,8 +2124,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetContainer(IWineD3DSurface* iface, - REFIID riid, void **ppContainer) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index ee3f364..b6e73ec 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2384,10 +2384,6 @@ interface IWineD3DClipper : IWineD3DBase ] interface IWineD3DSurface : IWineD3DResource { - HRESULT GetContainer( - [in] REFIID riid, - [out] void **container - ); HRESULT GetDesc( [out] WINED3DSURFACE_DESC *desc ); @@ -2501,10 +2497,6 @@ interface IWineD3DSurface : IWineD3DResource ] interface IWineD3DVolume : IWineD3DResource { - HRESULT GetContainer( - [in] REFIID riid, - [out] void **container - ); HRESULT GetDesc( [out] WINED3DVOLUME_DESC *desc );

1 0

Henri Verbeet : wined3d: Rename the "format" field in wined3d_format_desc to "id".
by Alexandre Julliard 26 Aug '10

26 Aug '10

Module: wine Branch: master Commit: b233e7b301ff524c9dfabaf60fc27d070d873b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b233e7b301ff524c9dfabaf60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 25 20:46:51 2010 +0200 wined3d: Rename the "format" field in wined3d_format_desc to "id". --- dlls/wined3d/buffer.c | 8 +++--- dlls/wined3d/context.c | 18 +++++++------- dlls/wined3d/cubetexture.c | 4 +- dlls/wined3d/device.c | 18 +++++++------- dlls/wined3d/directx.c | 21 ++++++++------- dlls/wined3d/drawprim.c | 14 +++++----- dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 53 ++++++++++++++++++++------------------- dlls/wined3d/surface_base.c | 23 +++++++++-------- dlls/wined3d/surface_gdi.c | 4 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 10 ++++---- dlls/wined3d/utils.c | 52 ++++++++++++++++++++------------------- dlls/wined3d/volume.c | 5 ++- dlls/wined3d/wined3d_private.h | 5 ++- 15 files changed, 124 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b233e7b301ff524c9dfab…

1 0

Henri Verbeet : d3dx9_36: Fix the D3DXFVFFromDeclarator() prototype.
by Alexandre Julliard 26 Aug '10

26 Aug '10

Module: wine Branch: master Commit: 5ed9403c74abd403b992a4a605f06b719a1a50ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed9403c74abd403b992a4a60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 25 20:46:52 2010 +0200 d3dx9_36: Fix the D3DXFVFFromDeclarator() prototype. The current version matches MSDN, but not the actual SDK header. --- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 2 +- include/d3dx9mesh.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 788c449..cc22107 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -203,7 +203,7 @@ HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD fvf, D3DVERTEXELEMENT9 Declaration[MA /************************************************************************* * D3DXFVFFromDeclarator */ -HRESULT WINAPI D3DXFVFFromDeclarator(const LPD3DVERTEXELEMENT9 *declaration, DWORD *fvf) +HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *declaration, DWORD *fvf) { FIXME("(%p, %p): stub\n", declaration, fvf); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 8d0f227..4cdd56b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -491,7 +491,7 @@ static void test_decl_to_fvf(const D3DVERTEXELEMENT9 test_decl[], DWORD expected copy_elements(decl, test_decl); - hr = D3DXFVFFromDeclarator((D3DVERTEXELEMENT9 **)&decl, &result_fvf); + hr = D3DXFVFFromDeclarator(decl, &result_fvf); if (todo) todo_wine ok(hr == expected_hr, "D3DXFVFFromDeclarator returned %#x, expected %#x, line #%u\n", hr, expected_hr, line); else ok(hr == expected_hr, "D3DXFVFFromDeclarator returned %#x, expected %#x, line #%u\n", diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index ff215b7..bc3dd81 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -159,7 +159,7 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *); HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]); -HRESULT WINAPI D3DXFVFFromDeclarator(const LPD3DVERTEXELEMENT9 *, DWORD *); +HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *decl, DWORD *fvf); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); #ifdef __cplusplus

1 0

Henri Verbeet : d3dx9_36/tests: Avoid a redundant vertex declaration copy in test_decl_to_fvf().
by Alexandre Julliard 26 Aug '10

26 Aug '10

Module: wine Branch: master Commit: 1bfd89986ce2398208ee0d19423bd15dc8547bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bfd89986ce2398208ee0d194… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 25 20:46:53 2010 +0200 d3dx9_36/tests: Avoid a redundant vertex declaration copy in test_decl_to_fvf(). --- dlls/d3dx9_36/tests/mesh.c | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4cdd56b..bf756dd 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -429,20 +429,6 @@ static inline void print_elements(const D3DVERTEXELEMENT9 *elements) } } -static inline void copy_elements(D3DVERTEXELEMENT9 *decl, const D3DVERTEXELEMENT9 *elements) -{ - unsigned int i; - D3DVERTEXELEMENT9 last = D3DDECL_END(); - int end1; - - for (i = 0; i < MAX_FVF_DECL_SIZE; i++) - { - memcpy(&decl[i], &elements[i], sizeof(D3DVERTEXELEMENT9)); - end1 = memcmp(&elements[i], &last, sizeof(D3DVERTEXELEMENT9)); - if (!end1) break; - } -} - static void compare_elements(const D3DVERTEXELEMENT9 *elements, const D3DVERTEXELEMENT9 *expected_elements, unsigned int line) { @@ -482,14 +468,11 @@ static void test_fvf_to_decl(DWORD test_fvf, const D3DVERTEXELEMENT9 expected_el if (SUCCEEDED(hr)) { compare_elements(decl, expected_elements, line); } } -static void test_decl_to_fvf(const D3DVERTEXELEMENT9 test_decl[], DWORD expected_fvf, HRESULT expected_hr, +static void test_decl_to_fvf(const D3DVERTEXELEMENT9 *decl, DWORD expected_fvf, HRESULT expected_hr, BOOL todo, unsigned int line) { HRESULT hr; DWORD result_fvf = 0xdeadbeef; - D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE]; - - copy_elements(decl, test_decl); hr = D3DXFVFFromDeclarator(decl, &result_fvf); if (todo) todo_wine ok(hr == expected_hr, "D3DXFVFFromDeclarator returned %#x, expected %#x, line #%u\n",

1 0