Module: wine Branch: master Commit: 592b347c79ddeaf895def4b0232ff9ee05db45f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=592b347c79ddeaf895def4b023...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Sep 17 09:22:39 2013 +0200
d3d10core: Avoid LPSTR.
---
dlls/d3d10core/device.c | 4 ++-- include/d3d10.idl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index c40a353..e694a80 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1610,8 +1610,8 @@ static void STDMETHODCALLTYPE d3d10_device_CheckCounterInfo(ID3D10Device *iface, }
static HRESULT STDMETHODCALLTYPE d3d10_device_CheckCounter(ID3D10Device *iface, - const D3D10_COUNTER_DESC *desc, D3D10_COUNTER_TYPE *type, UINT *active_counters, LPSTR name, - UINT *name_length, LPSTR units, UINT *units_length, LPSTR description, UINT *description_length) + const D3D10_COUNTER_DESC *desc, D3D10_COUNTER_TYPE *type, UINT *active_counters, char *name, + UINT *name_length, char *units, UINT *units_length, char *description, UINT *description_length) { FIXME("iface %p, desc %p, type %p, active_counters %p, name %p, name_length %p,\n" "\tunits %p, units_length %p, description %p, description_length %p stub!\n", diff --git a/include/d3d10.idl b/include/d3d10.idl index 73a9e62..9f84400 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -1559,11 +1559,11 @@ interface ID3D10Device : IUnknown [in] const D3D10_COUNTER_DESC *pDesc, [out] D3D10_COUNTER_TYPE *pType, [out] UINT *pActiveCounters, - [out] LPSTR szName, + [out] char *name, [in, out] UINT *pNameLength, - [out] LPSTR szUnits, + [out] char *units, [in, out] UINT *pUnitsLength, - [out] LPSTR szDescription, + [out] char *description, [in, out] UINT *pDescriptionLength); UINT GetCreationFlags(); HRESULT OpenSharedResource(