Commit 15dfe304 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

ddraw: Drop "Thunk_" from the names of the IDirect3DVertexBuffer methods.

parent da018679
...@@ -82,10 +82,8 @@ IDirect3DVertexBufferImpl_QueryInterface(IDirect3DVertexBuffer7 *iface, ...@@ -82,10 +82,8 @@ IDirect3DVertexBufferImpl_QueryInterface(IDirect3DVertexBuffer7 *iface,
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static HRESULT WINAPI static HRESULT WINAPI IDirect3DVertexBufferImpl_1_QueryInterface(IDirect3DVertexBuffer *iface,
Thunk_IDirect3DVertexBufferImpl_1_QueryInterface(IDirect3DVertexBuffer *iface, REFIID riid, void **obj)
REFIID riid,
void **obj)
{ {
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj);
...@@ -112,8 +110,7 @@ IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface) ...@@ -112,8 +110,7 @@ IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface)
return ref; return ref;
} }
static ULONG WINAPI static ULONG WINAPI IDirect3DVertexBufferImpl_1_AddRef(IDirect3DVertexBuffer *iface)
Thunk_IDirect3DVertexBufferImpl_1_AddRef(IDirect3DVertexBuffer *iface)
{ {
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
...@@ -176,8 +173,7 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface) ...@@ -176,8 +173,7 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface)
return ref; return ref;
} }
static ULONG WINAPI static ULONG WINAPI IDirect3DVertexBufferImpl_1_Release(IDirect3DVertexBuffer *iface)
Thunk_IDirect3DVertexBufferImpl_1_Release(IDirect3DVertexBuffer *iface)
{ {
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
...@@ -242,11 +238,8 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, ...@@ -242,11 +238,8 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface,
return hr; return hr;
} }
static HRESULT WINAPI static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Lock(IDirect3DVertexBuffer *iface, DWORD Flags,
Thunk_IDirect3DVertexBufferImpl_1_Lock(IDirect3DVertexBuffer *iface, void **Data, DWORD *Size)
DWORD Flags,
void **Data,
DWORD *Size)
{ {
TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, Flags, Data, Size); TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, Flags, Data, Size);
...@@ -276,8 +269,7 @@ IDirect3DVertexBufferImpl_Unlock(IDirect3DVertexBuffer7 *iface) ...@@ -276,8 +269,7 @@ IDirect3DVertexBufferImpl_Unlock(IDirect3DVertexBuffer7 *iface)
return D3D_OK; return D3D_OK;
} }
static HRESULT WINAPI static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Unlock(IDirect3DVertexBuffer *iface)
Thunk_IDirect3DVertexBufferImpl_1_Unlock(IDirect3DVertexBuffer *iface)
{ {
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
...@@ -379,15 +371,9 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, ...@@ -379,15 +371,9 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface,
return hr; return hr;
} }
static HRESULT WINAPI static HRESULT WINAPI IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVertexBuffer *iface,
Thunk_IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVertexBuffer *iface, DWORD VertexOp, DWORD DestIndex, DWORD Count, IDirect3DVertexBuffer *SrcBuffer,
DWORD VertexOp, DWORD SrcIndex, IDirect3DDevice3 *D3DDevice, DWORD Flags)
DWORD DestIndex,
DWORD Count,
IDirect3DVertexBuffer *SrcBuffer,
DWORD SrcIndex,
IDirect3DDevice3 *D3DDevice,
DWORD Flags)
{ {
IDirect3DVertexBufferImpl *Src = SrcBuffer ? vb_from_vb1(SrcBuffer) : NULL; IDirect3DVertexBufferImpl *Src = SrcBuffer ? vb_from_vb1(SrcBuffer) : NULL;
IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL;
...@@ -435,9 +421,8 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, ...@@ -435,9 +421,8 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface,
return D3D_OK; return D3D_OK;
} }
static HRESULT WINAPI static HRESULT WINAPI IDirect3DVertexBufferImpl_1_GetVertexBufferDesc(IDirect3DVertexBuffer *iface,
Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc(IDirect3DVertexBuffer *iface, D3DVERTEXBUFFERDESC *Desc)
D3DVERTEXBUFFERDESC *Desc)
{ {
TRACE("iface %p, desc %p.\n", iface, Desc); TRACE("iface %p, desc %p.\n", iface, Desc);
...@@ -484,10 +469,8 @@ IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 *iface, ...@@ -484,10 +469,8 @@ IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 *iface,
return DD_OK; return DD_OK;
} }
static HRESULT WINAPI static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer *iface,
Thunk_IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer *iface, IDirect3DDevice3 *D3DDevice, DWORD Flags)
IDirect3DDevice3 *D3DDevice,
DWORD Flags)
{ {
IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL;
...@@ -558,15 +541,15 @@ static const struct IDirect3DVertexBuffer7Vtbl d3d_vertex_buffer7_vtbl = ...@@ -558,15 +541,15 @@ static const struct IDirect3DVertexBuffer7Vtbl d3d_vertex_buffer7_vtbl =
static const struct IDirect3DVertexBufferVtbl d3d_vertex_buffer1_vtbl = static const struct IDirect3DVertexBufferVtbl d3d_vertex_buffer1_vtbl =
{ {
/*** IUnknown Methods ***/ /*** IUnknown Methods ***/
Thunk_IDirect3DVertexBufferImpl_1_QueryInterface, IDirect3DVertexBufferImpl_1_QueryInterface,
Thunk_IDirect3DVertexBufferImpl_1_AddRef, IDirect3DVertexBufferImpl_1_AddRef,
Thunk_IDirect3DVertexBufferImpl_1_Release, IDirect3DVertexBufferImpl_1_Release,
/*** IDirect3DVertexBuffer Methods ***/ /*** IDirect3DVertexBuffer Methods ***/
Thunk_IDirect3DVertexBufferImpl_1_Lock, IDirect3DVertexBufferImpl_1_Lock,
Thunk_IDirect3DVertexBufferImpl_1_Unlock, IDirect3DVertexBufferImpl_1_Unlock,
Thunk_IDirect3DVertexBufferImpl_1_ProcessVertices, IDirect3DVertexBufferImpl_1_ProcessVertices,
Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc, IDirect3DVertexBufferImpl_1_GetVertexBufferDesc,
Thunk_IDirect3DVertexBufferImpl_1_Optimize IDirect3DVertexBufferImpl_1_Optimize
}; };
HRESULT d3d_vertex_buffer_init(IDirect3DVertexBufferImpl *buffer, HRESULT d3d_vertex_buffer_init(IDirect3DVertexBufferImpl *buffer,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment