Fixed some warnings.
This commit is contained in:
parent
b3b61dad68
commit
2344798c46
|
@ -246,18 +246,25 @@ static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, R
|
|||
return ret_value;
|
||||
}
|
||||
|
||||
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
|
||||
# define XCAST(fun) (typeof(ddiavt.fun))
|
||||
#else
|
||||
# define XCAST(fun) (void*)
|
||||
#endif
|
||||
|
||||
static ICOM_VTABLE(IDirectInputA) ddiavt =
|
||||
{
|
||||
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
|
||||
IDirectInputAImpl_QueryInterface,
|
||||
IDirectInputAImpl_AddRef,
|
||||
IDirectInputAImpl_Release,
|
||||
IDirectInputAImpl_CreateDevice,
|
||||
IDirectInputAImpl_EnumDevices,
|
||||
IDirectInputAImpl_GetDeviceStatus,
|
||||
IDirectInputAImpl_RunControlPanel,
|
||||
IDirectInputAImpl_Initialize
|
||||
XCAST(QueryInterface)IDirectInputAImpl_QueryInterface,
|
||||
XCAST(AddRef)IDirectInputAImpl_AddRef,
|
||||
XCAST(Release)IDirectInputAImpl_Release,
|
||||
XCAST(CreateDevice)IDirectInputAImpl_CreateDevice,
|
||||
XCAST(EnumDevices)IDirectInputAImpl_EnumDevices,
|
||||
XCAST(GetDeviceStatus)IDirectInputAImpl_GetDeviceStatus,
|
||||
XCAST(RunControlPanel)IDirectInputAImpl_RunControlPanel,
|
||||
XCAST(Initialize)IDirectInputAImpl_Initialize
|
||||
};
|
||||
#undef XCAST
|
||||
|
||||
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
|
||||
# define XCAST(fun) (typeof(ddi7avt.fun))
|
||||
|
|
|
@ -333,6 +333,7 @@ static void _dump_DSBCAPS(DWORD xmask) {
|
|||
*/
|
||||
|
||||
/* IUnknown methods */
|
||||
#ifdef USE_DSOUND3D
|
||||
static HRESULT WINAPI IKsPropertySetImpl_QueryInterface(
|
||||
LPKSPROPERTYSET iface, REFIID riid, LPVOID *ppobj
|
||||
) {
|
||||
|
@ -341,21 +342,27 @@ static HRESULT WINAPI IKsPropertySetImpl_QueryInterface(
|
|||
FIXME("(%p,%s,%p), stub!\n",This,debugstr_guid(riid),ppobj);
|
||||
return E_FAIL;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef USE_DSOUND3D
|
||||
static ULONG WINAPI IKsPropertySetImpl_AddRef(LPKSPROPERTYSET iface) {
|
||||
ICOM_THIS(IKsPropertySetImpl,iface);
|
||||
|
||||
This->ref++;
|
||||
return This->ref;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef USE_DSOUND3D
|
||||
static ULONG WINAPI IKsPropertySetImpl_Release(LPKSPROPERTYSET iface) {
|
||||
ICOM_THIS(IKsPropertySetImpl,iface);
|
||||
|
||||
This->ref--;
|
||||
return This->ref;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef USE_DSOUND3D
|
||||
static HRESULT WINAPI IKsPropertySetImpl_Get(LPKSPROPERTYSET iface,
|
||||
REFGUID guidPropSet, ULONG dwPropID,
|
||||
LPVOID pInstanceData, ULONG cbInstanceData,
|
||||
|
@ -367,7 +374,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Get(LPKSPROPERTYSET iface,
|
|||
FIXME("(%p,%s,%ld,%p,%ld,%p,%ld,%p), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
|
||||
return E_PROP_ID_UNSUPPORTED;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef USE_DSOUND3D
|
||||
static HRESULT WINAPI IKsPropertySetImpl_Set(LPKSPROPERTYSET iface,
|
||||
REFGUID guidPropSet, ULONG dwPropID,
|
||||
LPVOID pInstanceData, ULONG cbInstanceData,
|
||||
|
@ -378,7 +387,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(LPKSPROPERTYSET iface,
|
|||
FIXME("(%p,%s,%ld,%p,%ld,%p,%ld), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
|
||||
return E_PROP_ID_UNSUPPORTED;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef USE_DSOUND3D
|
||||
static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(LPKSPROPERTYSET iface,
|
||||
REFGUID guidPropSet, ULONG dwPropID, PULONG pTypeSupport
|
||||
) {
|
||||
|
@ -387,7 +398,9 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(LPKSPROPERTYSET iface,
|
|||
FIXME("(%p,%s,%ld,%p), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
|
||||
return E_PROP_ID_UNSUPPORTED;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef USE_DSOUND3D
|
||||
static ICOM_VTABLE(IKsPropertySet) iksvt = {
|
||||
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
|
||||
IKsPropertySetImpl_QueryInterface,
|
||||
|
@ -397,6 +410,7 @@ static ICOM_VTABLE(IKsPropertySet) iksvt = {
|
|||
IKsPropertySetImpl_Set,
|
||||
IKsPropertySetImpl_QuerySupport
|
||||
};
|
||||
#endif
|
||||
|
||||
/*******************************************************************************
|
||||
* IDirectSound3DBuffer
|
||||
|
@ -1847,7 +1861,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
#if USE_DSOUND3D
|
||||
#ifdef USE_DSOUND3D
|
||||
if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) {
|
||||
IDirectSound3DBufferImpl *ds3db;
|
||||
|
||||
|
@ -2148,7 +2162,7 @@ static HRESULT WINAPI IDirectSoundImpl_CreateSoundBuffer(
|
|||
return err;
|
||||
}
|
||||
|
||||
#if USE_DSOUND3D
|
||||
#ifdef USE_DSOUND3D
|
||||
if (dsbd->dwFlags & DSBCAPS_CTRL3D) {
|
||||
IDirectSound3DBufferImpl *ds3db;
|
||||
|
||||
|
|
|
@ -207,7 +207,7 @@ int main(int argc,char**argv)
|
|||
}
|
||||
if (img==(void*)-1) {
|
||||
fprintf(stderr,"DOS memory map failed, error=%s\n",strerror(errno));
|
||||
fprintf(stderr,"in attempt to map %s, offset %08lX, length 110000, to offset 0\n",argv[0],fofs);
|
||||
fprintf(stderr,"in attempt to map %s, offset %08lX, length 110000, to offset 0\n",argv[0],(long)fofs);
|
||||
return 1;
|
||||
}
|
||||
/* initialize signals and system timer */
|
||||
|
|
Loading…
Reference in New Issue