ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Rename "pDesc" to "desc".

This commit is contained in:
Henri Verbeet 2010-09-06 22:18:54 +02:00 committed by Alexandre Julliard
parent 8a8ad1ccd8
commit 992cb88f71
3 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/wined3d/surface_base.c
View File

@ -146,24 +146,21 @@ void * WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface)
return ((IWineD3DSurfaceImpl *)iface)->resource.parent; return ((IWineD3DSurfaceImpl *)iface)->resource.parent;
} }
/* ****************************************************** HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc)
IWineD3DSurface IWineD3DSurface parts follow {
****************************************************** */ IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) { TRACE("iface %p, desc %p.\n", iface, desc);
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
TRACE("(%p) : copying into %p\n", This, pDesc); desc->format = surface->resource.format->id;
desc->resource_type = surface->resource.resourceType;
pDesc->format = This->resource.format->id; desc->usage = surface->resource.usage;
pDesc->resource_type = This->resource.resourceType; desc->pool = surface->resource.pool;
pDesc->usage = This->resource.usage; desc->size = surface->resource.size; /* dx8 only */
pDesc->pool = This->resource.pool; desc->multisample_type = surface->currentDesc.MultiSampleType;
pDesc->size = This->resource.size; /* dx8 only */ desc->multisample_quality = surface->currentDesc.MultiSampleQuality;
pDesc->multisample_type = This->currentDesc.MultiSampleType; desc->width = surface->currentDesc.Width;
pDesc->multisample_quality = This->currentDesc.MultiSampleQuality; desc->height = surface->currentDesc.Height;
pDesc->width = This->currentDesc.Width;
pDesc->height = This->currentDesc.Height;
return WINED3D_OK; return WINED3D_OK;
} }

26
dlls/wined3d/volume.c
View File

@ -187,22 +187,20 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa
return resource_get_type((IWineD3DResource *)iface); return resource_get_type((IWineD3DResource *)iface);
} }
/* ******************************************* static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc)
IWineD3DVolume parts follow
******************************************* */
static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *pDesc)
{ {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)iface;
TRACE("(%p) : copying into %p\n", This, pDesc);
pDesc->Format = This->resource.format->id; TRACE("iface %p, desc %p.\n", iface, desc);
pDesc->Type = This->resource.resourceType;
pDesc->Usage = This->resource.usage; desc->Format = volume->resource.format->id;
pDesc->Pool = This->resource.pool; desc->Type = volume->resource.resourceType;
pDesc->Size = This->resource.size; /* dx8 only */ desc->Usage = volume->resource.usage;
pDesc->Width = This->currentDesc.Width; desc->Pool = volume->resource.pool;
pDesc->Height = This->currentDesc.Height; desc->Size = volume->resource.size; /* dx8 only */
pDesc->Depth = This->currentDesc.Depth; desc->Width = volume->currentDesc.Width;
desc->Height = volume->currentDesc.Height;
desc->Depth = volume->currentDesc.Depth;
return WINED3D_OK; return WINED3D_OK;
} }

2
dlls/wined3d/wined3d_private.h
View File

@ -2150,7 +2150,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R
DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) DECLSPEC_HIDDEN;
DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface) DECLSPEC_HIDDEN;