dwrite: Use consistent trace format for rendering parameters object.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
3112144223
commit
87d6e45514
|
@ -54,14 +54,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct renderingparams {
|
struct renderingparams
|
||||||
|
{
|
||||||
IDWriteRenderingParams3 IDWriteRenderingParams3_iface;
|
IDWriteRenderingParams3 IDWriteRenderingParams3_iface;
|
||||||
LONG ref;
|
LONG refcount;
|
||||||
|
|
||||||
FLOAT gamma;
|
float gamma;
|
||||||
FLOAT contrast;
|
float contrast;
|
||||||
FLOAT grayscalecontrast;
|
float grayscalecontrast;
|
||||||
FLOAT cleartype_level;
|
float cleartype_level;
|
||||||
DWRITE_PIXEL_GEOMETRY geometry;
|
DWRITE_PIXEL_GEOMETRY geometry;
|
||||||
DWRITE_RENDERING_MODE1 mode;
|
DWRITE_RENDERING_MODE1 mode;
|
||||||
DWRITE_GRID_FIT_MODE gridfit;
|
DWRITE_GRID_FIT_MODE gridfit;
|
||||||
|
@ -74,9 +75,7 @@ static inline struct renderingparams *impl_from_IDWriteRenderingParams3(IDWriteR
|
||||||
|
|
||||||
static HRESULT WINAPI renderingparams_QueryInterface(IDWriteRenderingParams3 *iface, REFIID riid, void **obj)
|
static HRESULT WINAPI renderingparams_QueryInterface(IDWriteRenderingParams3 *iface, REFIID riid, void **obj)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj);
|
||||||
|
|
||||||
TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj);
|
|
||||||
|
|
||||||
if (IsEqualIID(riid, &IID_IDWriteRenderingParams3) ||
|
if (IsEqualIID(riid, &IID_IDWriteRenderingParams3) ||
|
||||||
IsEqualIID(riid, &IID_IDWriteRenderingParams2) ||
|
IsEqualIID(riid, &IID_IDWriteRenderingParams2) ||
|
||||||
|
@ -96,51 +95,61 @@ static HRESULT WINAPI renderingparams_QueryInterface(IDWriteRenderingParams3 *if
|
||||||
|
|
||||||
static ULONG WINAPI renderingparams_AddRef(IDWriteRenderingParams3 *iface)
|
static ULONG WINAPI renderingparams_AddRef(IDWriteRenderingParams3 *iface)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface);
|
||||||
ULONG ref = InterlockedIncrement(&This->ref);
|
ULONG refcount = InterlockedIncrement(¶ms->refcount);
|
||||||
TRACE("(%p)->(%d)\n", This, ref);
|
|
||||||
return ref;
|
TRACE("%p, refcount %d.\n", iface, refcount);
|
||||||
|
|
||||||
|
return refcount;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG WINAPI renderingparams_Release(IDWriteRenderingParams3 *iface)
|
static ULONG WINAPI renderingparams_Release(IDWriteRenderingParams3 *iface)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface);
|
||||||
ULONG ref = InterlockedDecrement(&This->ref);
|
ULONG refcount = InterlockedDecrement(¶ms->refcount);
|
||||||
|
|
||||||
TRACE("(%p)->(%d)\n", This, ref);
|
TRACE("%p, refcount %d.\n", iface, refcount);
|
||||||
|
|
||||||
if (!ref)
|
if (!refcount)
|
||||||
heap_free(This);
|
heap_free(params);
|
||||||
|
|
||||||
return ref;
|
return refcount;
|
||||||
}
|
}
|
||||||
|
|
||||||
static FLOAT WINAPI renderingparams_GetGamma(IDWriteRenderingParams3 *iface)
|
static float WINAPI renderingparams_GetGamma(IDWriteRenderingParams3 *iface)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface);
|
||||||
TRACE("(%p)\n", This);
|
|
||||||
return This->gamma;
|
TRACE("%p.\n", iface);
|
||||||
|
|
||||||
|
return params->gamma;
|
||||||
}
|
}
|
||||||
|
|
||||||
static FLOAT WINAPI renderingparams_GetEnhancedContrast(IDWriteRenderingParams3 *iface)
|
static float WINAPI renderingparams_GetEnhancedContrast(IDWriteRenderingParams3 *iface)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface);
|
||||||
TRACE("(%p)\n", This);
|
|
||||||
return This->contrast;
|
TRACE("%p.\n", iface);
|
||||||
|
|
||||||
|
return params->contrast;
|
||||||
}
|
}
|
||||||
|
|
||||||
static FLOAT WINAPI renderingparams_GetClearTypeLevel(IDWriteRenderingParams3 *iface)
|
static float WINAPI renderingparams_GetClearTypeLevel(IDWriteRenderingParams3 *iface)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface);
|
||||||
TRACE("(%p)\n", This);
|
|
||||||
return This->cleartype_level;
|
TRACE("%p.\n", iface);
|
||||||
|
|
||||||
|
return params->cleartype_level;
|
||||||
}
|
}
|
||||||
|
|
||||||
static DWRITE_PIXEL_GEOMETRY WINAPI renderingparams_GetPixelGeometry(IDWriteRenderingParams3 *iface)
|
static DWRITE_PIXEL_GEOMETRY WINAPI renderingparams_GetPixelGeometry(IDWriteRenderingParams3 *iface)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface);
|
||||||
TRACE("(%p)\n", This);
|
|
||||||
return This->geometry;
|
TRACE("%p.\n", iface);
|
||||||
|
|
||||||
|
return params->geometry;
|
||||||
}
|
}
|
||||||
|
|
||||||
static DWRITE_RENDERING_MODE rendering_mode_from_mode1(DWRITE_RENDERING_MODE1 mode)
|
static DWRITE_RENDERING_MODE rendering_mode_from_mode1(DWRITE_RENDERING_MODE1 mode)
|
||||||
|
@ -161,35 +170,42 @@ static DWRITE_RENDERING_MODE rendering_mode_from_mode1(DWRITE_RENDERING_MODE1 mo
|
||||||
|
|
||||||
static DWRITE_RENDERING_MODE WINAPI renderingparams_GetRenderingMode(IDWriteRenderingParams3 *iface)
|
static DWRITE_RENDERING_MODE WINAPI renderingparams_GetRenderingMode(IDWriteRenderingParams3 *iface)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface);
|
||||||
|
|
||||||
TRACE("(%p)\n", This);
|
TRACE("%p.\n", iface);
|
||||||
|
|
||||||
return rendering_mode_from_mode1(This->mode);
|
return rendering_mode_from_mode1(params->mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
static FLOAT WINAPI renderingparams1_GetGrayscaleEnhancedContrast(IDWriteRenderingParams3 *iface)
|
static float WINAPI renderingparams1_GetGrayscaleEnhancedContrast(IDWriteRenderingParams3 *iface)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface);
|
||||||
TRACE("(%p)\n", This);
|
|
||||||
return This->grayscalecontrast;
|
TRACE("%p.\n", iface);
|
||||||
|
|
||||||
|
return params->grayscalecontrast;
|
||||||
}
|
}
|
||||||
|
|
||||||
static DWRITE_GRID_FIT_MODE WINAPI renderingparams2_GetGridFitMode(IDWriteRenderingParams3 *iface)
|
static DWRITE_GRID_FIT_MODE WINAPI renderingparams2_GetGridFitMode(IDWriteRenderingParams3 *iface)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface);
|
||||||
TRACE("(%p)\n", This);
|
|
||||||
return This->gridfit;
|
TRACE("%p.\n", iface);
|
||||||
|
|
||||||
|
return params->gridfit;
|
||||||
}
|
}
|
||||||
|
|
||||||
static DWRITE_RENDERING_MODE1 WINAPI renderingparams3_GetRenderingMode1(IDWriteRenderingParams3 *iface)
|
static DWRITE_RENDERING_MODE1 WINAPI renderingparams3_GetRenderingMode1(IDWriteRenderingParams3 *iface)
|
||||||
{
|
{
|
||||||
struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface);
|
struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface);
|
||||||
TRACE("(%p)\n", This);
|
|
||||||
return This->mode;
|
TRACE("%p.\n", iface);
|
||||||
|
|
||||||
|
return params->mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = {
|
static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl =
|
||||||
|
{
|
||||||
renderingparams_QueryInterface,
|
renderingparams_QueryInterface,
|
||||||
renderingparams_AddRef,
|
renderingparams_AddRef,
|
||||||
renderingparams_Release,
|
renderingparams_Release,
|
||||||
|
@ -203,11 +219,11 @@ static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = {
|
||||||
renderingparams3_GetRenderingMode1
|
renderingparams3_GetRenderingMode1
|
||||||
};
|
};
|
||||||
|
|
||||||
static HRESULT create_renderingparams(FLOAT gamma, FLOAT contrast, FLOAT grayscalecontrast, FLOAT cleartype_level,
|
static HRESULT create_renderingparams(float gamma, float contrast, float grayscalecontrast, float cleartype_level,
|
||||||
DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE1 mode, DWRITE_GRID_FIT_MODE gridfit,
|
DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE1 mode, DWRITE_GRID_FIT_MODE gridfit,
|
||||||
IDWriteRenderingParams3 **params)
|
IDWriteRenderingParams3 **params)
|
||||||
{
|
{
|
||||||
struct renderingparams *This;
|
struct renderingparams *object;
|
||||||
|
|
||||||
*params = NULL;
|
*params = NULL;
|
||||||
|
|
||||||
|
@ -217,21 +233,21 @@ static HRESULT create_renderingparams(FLOAT gamma, FLOAT contrast, FLOAT graysca
|
||||||
if ((UINT32)gridfit > DWRITE_GRID_FIT_MODE_ENABLED || (UINT32)geometry > DWRITE_PIXEL_GEOMETRY_BGR)
|
if ((UINT32)gridfit > DWRITE_GRID_FIT_MODE_ENABLED || (UINT32)geometry > DWRITE_PIXEL_GEOMETRY_BGR)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
This = heap_alloc(sizeof(struct renderingparams));
|
if (!(object = heap_alloc(sizeof(*object))))
|
||||||
if (!This) return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
|
|
||||||
This->IDWriteRenderingParams3_iface.lpVtbl = &renderingparamsvtbl;
|
object->IDWriteRenderingParams3_iface.lpVtbl = &renderingparamsvtbl;
|
||||||
This->ref = 1;
|
object->refcount = 1;
|
||||||
|
|
||||||
This->gamma = gamma;
|
object->gamma = gamma;
|
||||||
This->contrast = contrast;
|
object->contrast = contrast;
|
||||||
This->grayscalecontrast = grayscalecontrast;
|
object->grayscalecontrast = grayscalecontrast;
|
||||||
This->cleartype_level = cleartype_level;
|
object->cleartype_level = cleartype_level;
|
||||||
This->geometry = geometry;
|
object->geometry = geometry;
|
||||||
This->mode = mode;
|
object->mode = mode;
|
||||||
This->gridfit = gridfit;
|
object->gridfit = gridfit;
|
||||||
|
|
||||||
*params = &This->IDWriteRenderingParams3_iface;
|
*params = &object->IDWriteRenderingParams3_iface;
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue