Henri Verbeet : wined3d: Remove IWineD3DVertexDeclaration_SetDeclaration() from the public interface.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4330d20d0df55bc15058083a377d985caa2fd1bc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4330d20d0df55bc15058083a37...

Author: Henri Verbeet 
Date:   Fri Mar 27 10:25:55 2009 +0100

wined3d: Remove IWineD3DVertexDeclaration_SetDeclaration() from the public interface.

---

dlls/wined3d/device.c            |    3 ++-
 dlls/wined3d/vertexdeclaration.c |    7 +++----
 dlls/wined3d/wined3d_private.h   |    3 +++
 include/wine/wined3d.idl         |    4 ----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 70e6f63..a115192 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2172,7 +2172,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice*

*ppVertexDeclaration = (IWineD3DVertexDeclaration *)object;

-    hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count);
+    hr = vertexdeclaration_init(object, elements, element_count);
+
     if(FAILED(hr)) {
         IWineD3DVertexDeclaration_Release((IWineD3DVertexDeclaration *)object);
         *ppVertexDeclaration = NULL;
diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c
index 0091ce4..ae3bbc1 100644
--- a/dlls/wined3d/vertexdeclaration.c
+++ b/dlls/wined3d/vertexdeclaration.c
@@ -191,9 +191,9 @@ static BOOL declaration_element_valid_ffp(const WINED3DVERTEXELEMENT *element)
     }
 }

-static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVertexDeclaration *iface,
-        const WINED3DVERTEXELEMENT *elements, UINT element_count) {
-    IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface;
+HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *This,
+        const WINED3DVERTEXELEMENT *elements, UINT element_count)
+{
     HRESULT hr = WINED3D_OK;
     unsigned int i;
     char isPreLoaded[MAX_STREAMS];
@@ -271,5 +271,4 @@ const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl =
     /* IWineD3DVertexDeclaration */
     IWineD3DVertexDeclarationImpl_GetParent,
     IWineD3DVertexDeclarationImpl_GetDevice,
-    IWineD3DVertexDeclarationImpl_SetDeclaration
 };
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 73c394f..fd37ef5 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1765,6 +1765,9 @@ typedef struct IWineD3DVertexDeclarationImpl {

extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;

+HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *This,
+        const WINED3DVERTEXELEMENT *elements, UINT element_count);
+
 /*****************************************************************************
  * IWineD3DStateBlock implementation structure
  */
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index 0c17d7d..2f92898 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2758,10 +2758,6 @@ interface IWineD3DVertexDeclaration : IWineD3DBase
     HRESULT GetDevice(
         [out] IWineD3DDevice **device
     );
-    HRESULT SetDeclaration(
-        [in] const WINED3DVERTEXELEMENT *elements,
-        [in] UINT element_count
-    );
 }

[