[PATCH 1/3] dsound: Drop "Buffer" from the IKsPropertySet method names.

[Michael Stefaniuc]

---
 dlls/dsound/buffer.c |   56 +++++++++++++++++--------------------------------
 1 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index bc9b955..d76d837 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -1124,14 +1124,12 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
 }
 
 /*******************************************************************************
- *              IKsBufferPropertySet
+ *              IKsPropertySet
  */
 
 /* IUnknown methods */
-static HRESULT WINAPI IKsBufferPropertySetImpl_QueryInterface(
-    LPKSPROPERTYSET iface,
-    REFIID riid,
-    LPVOID *ppobj )
+static HRESULT WINAPI IKsPropertySetImpl_QueryInterface(IKsPropertySet *iface, REFIID riid,
+        void **ppobj)
 {
     IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
     TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
@@ -1139,7 +1137,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QueryInterface(
     return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER8)This->dsb, riid, ppobj);
 }
 
-static ULONG WINAPI IKsBufferPropertySetImpl_AddRef(LPKSPROPERTYSET iface)
+static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface)
 {
     IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
     ULONG ref = InterlockedIncrement(&(This->ref));
@@ -1147,7 +1145,7 @@ static ULONG WINAPI IKsBufferPropertySetImpl_AddRef(LPKSPROPERTYSET iface)
     return ref;
 }
 
-static ULONG WINAPI IKsBufferPropertySetImpl_Release(LPKSPROPERTYSET iface)
+static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface)
 {
     IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
     ULONG ref = InterlockedDecrement(&(This->ref));
@@ -1162,15 +1160,9 @@ static ULONG WINAPI IKsBufferPropertySetImpl_Release(LPKSPROPERTYSET iface)
     return ref;
 }
 
-static HRESULT WINAPI IKsBufferPropertySetImpl_Get(
-    LPKSPROPERTYSET iface,
-    REFGUID guidPropSet,
-    ULONG dwPropID,
-    LPVOID pInstanceData,
-    ULONG cbInstanceData,
-    LPVOID pPropData,
-    ULONG cbPropData,
-    PULONG pcbReturned )
+static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guidPropSet,
+        ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
+        ULONG cbPropData, ULONG *pcbReturned)
 {
     IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
 
@@ -1180,14 +1172,9 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Get(
     return E_PROP_ID_UNSUPPORTED;
 }
 
-static HRESULT WINAPI IKsBufferPropertySetImpl_Set(
-    LPKSPROPERTYSET iface,
-    REFGUID guidPropSet,
-    ULONG dwPropID,
-    LPVOID pInstanceData,
-    ULONG cbInstanceData,
-    LPVOID pPropData,
-    ULONG cbPropData )
+static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guidPropSet,
+        ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
+        ULONG cbPropData)
 {
     IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
 
@@ -1196,11 +1183,8 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Set(
     return E_PROP_ID_UNSUPPORTED;
 }
 
-static HRESULT WINAPI IKsBufferPropertySetImpl_QuerySupport(
-    LPKSPROPERTYSET iface,
-    REFGUID guidPropSet,
-    ULONG dwPropID,
-    PULONG pTypeSupport )
+static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REFGUID guidPropSet,
+        ULONG dwPropID, ULONG *pTypeSupport)
 {
     IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface;
 
@@ -1210,12 +1194,12 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QuerySupport(
 }
 
 static const IKsPropertySetVtbl iksbvt = {
-    IKsBufferPropertySetImpl_QueryInterface,
-    IKsBufferPropertySetImpl_AddRef,
-    IKsBufferPropertySetImpl_Release,
-    IKsBufferPropertySetImpl_Get,
-    IKsBufferPropertySetImpl_Set,
-    IKsBufferPropertySetImpl_QuerySupport
+    IKsPropertySetImpl_QueryInterface,
+    IKsPropertySetImpl_AddRef,
+    IKsPropertySetImpl_Release,
+    IKsPropertySetImpl_Get,
+    IKsPropertySetImpl_Set,
+    IKsPropertySetImpl_QuerySupport
 };
 
 HRESULT IKsBufferPropertySetImpl_Create(
@@ -1249,7 +1233,7 @@ HRESULT IKsBufferPropertySetImpl_Destroy(
 {
     TRACE("(%p)\n",piks);
 
-    while (IKsBufferPropertySetImpl_Release((LPKSPROPERTYSET)piks) > 0);
+    while (IKsPropertySetImpl_Release((LPKSPROPERTYSET)piks) > 0);
 
     return S_OK;
 }
-- 
1.7.6.5