Skip to content

W
wine-cw
Commit 68925388 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

dpvoice: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a49e8263
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 24 deletions
dlls/dpvoice/Makefile.in
View file @ 68925388
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dpvoice.dll MODULE = dpvoice.dll
IMPORTS = dxguid uuid IMPORTS = dxguid uuid
......
dlls/dpvoice/client.c
View file @ 68925388
...@@ -74,7 +74,7 @@ static ULONG WINAPI dpvclient_AddRef(IDirectPlayVoiceClient *iface) ...@@ -74,7 +74,7 @@ static ULONG WINAPI dpvclient_AddRef(IDirectPlayVoiceClient *iface)
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%u\n", This, ref); TRACE("(%p) ref=%lu\n", This, ref);
return ref; return ref;
} }
...@@ -84,7 +84,7 @@ static ULONG WINAPI dpvclient_Release(IDirectPlayVoiceClient *iface) ...@@ -84,7 +84,7 @@ static ULONG WINAPI dpvclient_Release(IDirectPlayVoiceClient *iface)
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%u\n", This, ref); TRACE("(%p) ref=%lu\n", This, ref);
if (!ref) if (!ref)
{ {
...@@ -97,7 +97,7 @@ static HRESULT WINAPI dpvclient_Initialize(IDirectPlayVoiceClient *iface,LPUNKNO ...@@ -97,7 +97,7 @@ static HRESULT WINAPI dpvclient_Initialize(IDirectPlayVoiceClient *iface,LPUNKNO
void *pUserContext, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) void *pUserContext, DWORD *pdwMessageMask, DWORD dwMessageMaskElements)
{ {
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
FIXME("%p %p %p %p %p %d\n", This, pVoid, pMessageHandler, pUserContext,pdwMessageMask, dwMessageMaskElements); FIXME("%p %p %p %p %p %ld\n", This, pVoid, pMessageHandler, pUserContext,pdwMessageMask, dwMessageMaskElements);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -105,14 +105,14 @@ static HRESULT WINAPI dpvclient_Connect(IDirectPlayVoiceClient *iface, PDVSOUNDD ...@@ -105,14 +105,14 @@ static HRESULT WINAPI dpvclient_Connect(IDirectPlayVoiceClient *iface, PDVSOUNDD
PDVCLIENTCONFIG pdvClientConfig, DWORD dwFlags) PDVCLIENTCONFIG pdvClientConfig, DWORD dwFlags)
{ {
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
FIXME("%p %p %p %d\n", This, pSoundDeviceConfig, pdvClientConfig, dwFlags); FIXME("%p %p %p %ld\n", This, pSoundDeviceConfig, pdvClientConfig, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI dpvclient_Disconnect(IDirectPlayVoiceClient *iface, DWORD dwFlags) static HRESULT WINAPI dpvclient_Disconnect(IDirectPlayVoiceClient *iface, DWORD dwFlags)
{ {
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
FIXME("%p %d\n", This, dwFlags); FIXME("%p %ld\n", This, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -148,7 +148,7 @@ static HRESULT WINAPI dpvclient_GetCompressionTypes(IDirectPlayVoiceClient *ifac ...@@ -148,7 +148,7 @@ static HRESULT WINAPI dpvclient_GetCompressionTypes(IDirectPlayVoiceClient *ifac
DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags)
{ {
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); FIXME("%p %p %p %p %ld semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags);
return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags);
} }
...@@ -156,7 +156,7 @@ static HRESULT WINAPI dpvclient_SetTransmitTargets(IDirectPlayVoiceClient *iface ...@@ -156,7 +156,7 @@ static HRESULT WINAPI dpvclient_SetTransmitTargets(IDirectPlayVoiceClient *iface
DWORD dwNumTargets, DWORD dwFlags) DWORD dwNumTargets, DWORD dwFlags)
{ {
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
FIXME("%p %p %d %d\n", This, pdvIDTargets, dwNumTargets, dwFlags); FIXME("%p %p %ld %ld\n", This, pdvIDTargets, dwNumTargets, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -164,7 +164,7 @@ static HRESULT WINAPI dpvclient_GetTransmitTargets(IDirectPlayVoiceClient *iface ...@@ -164,7 +164,7 @@ static HRESULT WINAPI dpvclient_GetTransmitTargets(IDirectPlayVoiceClient *iface
DWORD *pdwNumTargets, DWORD dwFlags) DWORD *pdwNumTargets, DWORD dwFlags)
{ {
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
FIXME("%p %p %d\n", This, pdwNumTargets, dwFlags); FIXME("%p %p %ld\n", This, pdwNumTargets, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -173,21 +173,21 @@ static HRESULT WINAPI dpvclient_Create3DSoundBuffer(IDirectPlayVoiceClient *ifac ...@@ -173,21 +173,21 @@ static HRESULT WINAPI dpvclient_Create3DSoundBuffer(IDirectPlayVoiceClient *ifac
LPDIRECTSOUND3DBUFFER *lpUserBuffer) LPDIRECTSOUND3DBUFFER *lpUserBuffer)
{ {
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
FIXME("%p %d %p %d %d %p\n", This, dvID, lpdsSourceBuffer, dwPriority, dwFlags, lpUserBuffer); FIXME("%p %ld %p %ld %ld %p\n", This, dvID, lpdsSourceBuffer, dwPriority, dwFlags, lpUserBuffer);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI dpvclient_Delete3DSoundBuffer(IDirectPlayVoiceClient *iface, DVID dvID, LPDIRECTSOUND3DBUFFER *lpUserBuffer) static HRESULT WINAPI dpvclient_Delete3DSoundBuffer(IDirectPlayVoiceClient *iface, DVID dvID, LPDIRECTSOUND3DBUFFER *lpUserBuffer)
{ {
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
FIXME("%p %d %p\n", This, dvID, lpUserBuffer); FIXME("%p %ld %p\n", This, dvID, lpUserBuffer);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI dpvclient_SetNotifyMask(IDirectPlayVoiceClient *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) static HRESULT WINAPI dpvclient_SetNotifyMask(IDirectPlayVoiceClient *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements)
{ {
IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface);
FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); FIXME("%p %p %ld\n", This, pdwMessageMask, dwMessageMaskElements);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -261,7 +261,7 @@ static ULONG WINAPI dpvtest_AddRef(IDirectPlayVoiceTest *iface) ...@@ -261,7 +261,7 @@ static ULONG WINAPI dpvtest_AddRef(IDirectPlayVoiceTest *iface)
IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%u\n", This, ref); TRACE("(%p) ref=%lu\n", This, ref);
return ref; return ref;
} }
...@@ -271,7 +271,7 @@ static ULONG WINAPI dpvtest_Release(IDirectPlayVoiceTest *iface) ...@@ -271,7 +271,7 @@ static ULONG WINAPI dpvtest_Release(IDirectPlayVoiceTest *iface)
IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%u\n", This, ref); TRACE("(%p) ref=%lu\n", This, ref);
if (!ref) if (!ref)
{ {
...@@ -284,7 +284,7 @@ static HRESULT WINAPI dpvtest_CheckAudioSetup(IDirectPlayVoiceTest *iface, const ...@@ -284,7 +284,7 @@ static HRESULT WINAPI dpvtest_CheckAudioSetup(IDirectPlayVoiceTest *iface, const
HWND hwndParent, DWORD dwFlags) HWND hwndParent, DWORD dwFlags)
{ {
IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface);
FIXME("%p %s %s %p %d\n", This, debugstr_guid(pguidPlaybackDevice), FIXME("%p %s %s %p %ld\n", This, debugstr_guid(pguidPlaybackDevice),
debugstr_guid(pguidCaptureDevice), hwndParent, dwFlags); debugstr_guid(pguidCaptureDevice), hwndParent, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/dpvoice/server.c
View file @ 68925388
...@@ -100,7 +100,7 @@ static ULONG WINAPI dpvserver_AddRef(IDirectPlayVoiceServer *iface) ...@@ -100,7 +100,7 @@ static ULONG WINAPI dpvserver_AddRef(IDirectPlayVoiceServer *iface)
IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%u\n", This, ref); TRACE("(%p) ref=%lu\n", This, ref);
return ref; return ref;
} }
...@@ -110,7 +110,7 @@ static ULONG WINAPI dpvserver_Release(IDirectPlayVoiceServer *iface) ...@@ -110,7 +110,7 @@ static ULONG WINAPI dpvserver_Release(IDirectPlayVoiceServer *iface)
IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%u\n", This, ref); TRACE("(%p) ref=%lu\n", This, ref);
if (!ref) if (!ref)
{ {
...@@ -123,21 +123,21 @@ static HRESULT WINAPI dpvserver_Initialize(IDirectPlayVoiceServer *iface, IUnkno ...@@ -123,21 +123,21 @@ static HRESULT WINAPI dpvserver_Initialize(IDirectPlayVoiceServer *iface, IUnkno
void *pUserContext, DWORD *lpdwMessageMask, DWORD dwMessageMaskElements) void *pUserContext, DWORD *lpdwMessageMask, DWORD dwMessageMaskElements)
{ {
IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface);
FIXME("%p %p %p %p %p %d\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements); FIXME("%p %p %p %p %p %ld\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI dpvserver_StartSession(IDirectPlayVoiceServer *iface, PDVSESSIONDESC pSessionDesc, DWORD dwFlags) static HRESULT WINAPI dpvserver_StartSession(IDirectPlayVoiceServer *iface, PDVSESSIONDESC pSessionDesc, DWORD dwFlags)
{ {
IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface);
FIXME("%p %p %d\n", This, pSessionDesc, dwFlags); FIXME("%p %p %ld\n", This, pSessionDesc, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI dpvserver_StopSession(IDirectPlayVoiceServer *iface, DWORD dwFlags) static HRESULT WINAPI dpvserver_StopSession(IDirectPlayVoiceServer *iface, DWORD dwFlags)
{ {
IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface);
FIXME("%p %d\n", This, dwFlags); FIXME("%p %ld\n", This, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -166,7 +166,7 @@ static HRESULT WINAPI dpvserver_GetCompressionTypes(IDirectPlayVoiceServer *ifac ...@@ -166,7 +166,7 @@ static HRESULT WINAPI dpvserver_GetCompressionTypes(IDirectPlayVoiceServer *ifac
DWORD *pdwNumElements, DWORD dwFlags) DWORD *pdwNumElements, DWORD dwFlags)
{ {
IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface);
FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); FIXME("%p %p %p %p %ld semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags);
return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags);
} }
...@@ -174,7 +174,7 @@ static HRESULT WINAPI dpvserver_SetTransmitTargets(IDirectPlayVoiceServer *iface ...@@ -174,7 +174,7 @@ static HRESULT WINAPI dpvserver_SetTransmitTargets(IDirectPlayVoiceServer *iface
DWORD dwNumTargets, DWORD dwFlags) DWORD dwNumTargets, DWORD dwFlags)
{ {
IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface);
FIXME("%p %d %p %d %d\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags); FIXME("%p %ld %p %ld %ld\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -182,14 +182,14 @@ static HRESULT WINAPI dpvserver_GetTransmitTargets(IDirectPlayVoiceServer *iface ...@@ -182,14 +182,14 @@ static HRESULT WINAPI dpvserver_GetTransmitTargets(IDirectPlayVoiceServer *iface
DWORD *pdwNumTargets, DWORD dwFlags) DWORD *pdwNumTargets, DWORD dwFlags)
{ {
IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface);
FIXME("%p %d %p %p %d\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags); FIXME("%p %ld %p %p %ld\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI dpvserver_SetNotifyMask(IDirectPlayVoiceServer *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) static HRESULT WINAPI dpvserver_SetNotifyMask(IDirectPlayVoiceServer *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements)
{ {
IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface);
FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); FIXME("%p %p %ld\n", This, pdwMessageMask, dwMessageMaskElements);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
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