Skip to content

W
wine-winehq
Commit c699803f authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

d3drm: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 343ddade
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 120 deletions
dlls/d3drm/Makefile.in
View file @ c699803f
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = d3drm.dll MODULE = d3drm.dll
IMPORTLIB = d3drm IMPORTLIB = d3drm
IMPORTS = d3dxof ddraw IMPORTS = d3dxof ddraw
......
dlls/d3drm/device.c
View file @ c699803f
...@@ -307,7 +307,7 @@ static ULONG WINAPI d3drm_device3_AddRef(IDirect3DRMDevice3 *iface) ...@@ -307,7 +307,7 @@ static ULONG WINAPI d3drm_device3_AddRef(IDirect3DRMDevice3 *iface)
struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface);
ULONG refcount = InterlockedIncrement(&device->obj.ref); ULONG refcount = InterlockedIncrement(&device->obj.ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -335,7 +335,7 @@ static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface) ...@@ -335,7 +335,7 @@ static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface)
struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface);
ULONG refcount = InterlockedDecrement(&device->obj.ref); ULONG refcount = InterlockedDecrement(&device->obj.ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
d3drm_device_destroy(device); d3drm_device_destroy(device);
...@@ -453,7 +453,7 @@ static HRESULT WINAPI d3drm_device3_SetAppData(IDirect3DRMDevice3 *iface, DWORD ...@@ -453,7 +453,7 @@ static HRESULT WINAPI d3drm_device3_SetAppData(IDirect3DRMDevice3 *iface, DWORD
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
device->obj.appdata = data; device->obj.appdata = data;
...@@ -464,7 +464,7 @@ static HRESULT WINAPI d3drm_device2_SetAppData(IDirect3DRMDevice2 *iface, DWORD ...@@ -464,7 +464,7 @@ static HRESULT WINAPI d3drm_device2_SetAppData(IDirect3DRMDevice2 *iface, DWORD
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data); return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data);
} }
...@@ -473,7 +473,7 @@ static HRESULT WINAPI d3drm_device1_SetAppData(IDirect3DRMDevice *iface, DWORD d ...@@ -473,7 +473,7 @@ static HRESULT WINAPI d3drm_device1_SetAppData(IDirect3DRMDevice *iface, DWORD d
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data); return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data);
} }
...@@ -590,7 +590,7 @@ static HRESULT WINAPI d3drm_device3_Init(IDirect3DRMDevice3 *iface, ULONG width, ...@@ -590,7 +590,7 @@ static HRESULT WINAPI d3drm_device3_Init(IDirect3DRMDevice3 *iface, ULONG width,
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface);
FIXME("iface %p, width %u, height %u stub!\n", iface, width, height); FIXME("iface %p, width %lu, height %lu stub!\n", iface, width, height);
device->height = height; device->height = height;
device->width = width; device->width = width;
...@@ -602,7 +602,7 @@ static HRESULT WINAPI d3drm_device2_Init(IDirect3DRMDevice2 *iface, ULONG width, ...@@ -602,7 +602,7 @@ static HRESULT WINAPI d3drm_device2_Init(IDirect3DRMDevice2 *iface, ULONG width,
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface);
TRACE("iface %p, width %u, height %u.\n", iface, width, height); TRACE("iface %p, width %lu, height %lu.\n", iface, width, height);
return d3drm_device3_Init(&device->IDirect3DRMDevice3_iface, width, height); return d3drm_device3_Init(&device->IDirect3DRMDevice3_iface, width, height);
} }
...@@ -611,7 +611,7 @@ static HRESULT WINAPI d3drm_device1_Init(IDirect3DRMDevice *iface, ULONG width, ...@@ -611,7 +611,7 @@ static HRESULT WINAPI d3drm_device1_Init(IDirect3DRMDevice *iface, ULONG width,
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface);
TRACE("iface %p, width %u, height %u.\n", iface, width, height); TRACE("iface %p, width %lu, height %lu.\n", iface, width, height);
return d3drm_device3_Init(&device->IDirect3DRMDevice3_iface, width, height); return d3drm_device3_Init(&device->IDirect3DRMDevice3_iface, width, height);
} }
...@@ -759,7 +759,7 @@ static HRESULT WINAPI d3drm_device1_DeleteUpdateCallback(IDirect3DRMDevice *ifac ...@@ -759,7 +759,7 @@ static HRESULT WINAPI d3drm_device1_DeleteUpdateCallback(IDirect3DRMDevice *ifac
static HRESULT WINAPI d3drm_device3_SetBufferCount(IDirect3DRMDevice3 *iface, DWORD count) static HRESULT WINAPI d3drm_device3_SetBufferCount(IDirect3DRMDevice3 *iface, DWORD count)
{ {
FIXME("iface %p, count %u stub!\n", iface, count); FIXME("iface %p, count %lu stub!\n", iface, count);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -768,7 +768,7 @@ static HRESULT WINAPI d3drm_device2_SetBufferCount(IDirect3DRMDevice2 *iface, DW ...@@ -768,7 +768,7 @@ static HRESULT WINAPI d3drm_device2_SetBufferCount(IDirect3DRMDevice2 *iface, DW
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface);
TRACE("iface %p, count %u.\n", iface, count); TRACE("iface %p, count %lu.\n", iface, count);
return d3drm_device3_SetBufferCount(&device->IDirect3DRMDevice3_iface, count); return d3drm_device3_SetBufferCount(&device->IDirect3DRMDevice3_iface, count);
} }
...@@ -777,7 +777,7 @@ static HRESULT WINAPI d3drm_device1_SetBufferCount(IDirect3DRMDevice *iface, DWO ...@@ -777,7 +777,7 @@ static HRESULT WINAPI d3drm_device1_SetBufferCount(IDirect3DRMDevice *iface, DWO
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface);
TRACE("iface %p, count %u.\n", iface, count); TRACE("iface %p, count %lu.\n", iface, count);
return d3drm_device3_SetBufferCount(&device->IDirect3DRMDevice3_iface, count); return d3drm_device3_SetBufferCount(&device->IDirect3DRMDevice3_iface, count);
} }
...@@ -838,7 +838,7 @@ static HRESULT WINAPI d3drm_device1_SetDither(IDirect3DRMDevice *iface, BOOL ena ...@@ -838,7 +838,7 @@ static HRESULT WINAPI d3drm_device1_SetDither(IDirect3DRMDevice *iface, BOOL ena
static HRESULT WINAPI d3drm_device3_SetShades(IDirect3DRMDevice3 *iface, DWORD count) static HRESULT WINAPI d3drm_device3_SetShades(IDirect3DRMDevice3 *iface, DWORD count)
{ {
FIXME("iface %p, count %u stub!\n", iface, count); FIXME("iface %p, count %lu stub!\n", iface, count);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -847,7 +847,7 @@ static HRESULT WINAPI d3drm_device2_SetShades(IDirect3DRMDevice2 *iface, DWORD c ...@@ -847,7 +847,7 @@ static HRESULT WINAPI d3drm_device2_SetShades(IDirect3DRMDevice2 *iface, DWORD c
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface);
TRACE("iface %p, count %u.\n", iface, count); TRACE("iface %p, count %lu.\n", iface, count);
return d3drm_device3_SetShades(&device->IDirect3DRMDevice3_iface, count); return d3drm_device3_SetShades(&device->IDirect3DRMDevice3_iface, count);
} }
...@@ -856,7 +856,7 @@ static HRESULT WINAPI d3drm_device1_SetShades(IDirect3DRMDevice *iface, DWORD co ...@@ -856,7 +856,7 @@ static HRESULT WINAPI d3drm_device1_SetShades(IDirect3DRMDevice *iface, DWORD co
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface);
TRACE("iface %p, count %u.\n", iface, count); TRACE("iface %p, count %lu.\n", iface, count);
return d3drm_device3_SetShades(&device->IDirect3DRMDevice3_iface, count); return d3drm_device3_SetShades(&device->IDirect3DRMDevice3_iface, count);
} }
...@@ -865,7 +865,7 @@ static HRESULT WINAPI d3drm_device3_SetQuality(IDirect3DRMDevice3 *iface, D3DRMR ...@@ -865,7 +865,7 @@ static HRESULT WINAPI d3drm_device3_SetQuality(IDirect3DRMDevice3 *iface, D3DRMR
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface);
TRACE("iface %p, quality %u.\n", iface, quality); TRACE("iface %p, quality %lu.\n", iface, quality);
device->quality = quality; device->quality = quality;
...@@ -876,7 +876,7 @@ static HRESULT WINAPI d3drm_device2_SetQuality(IDirect3DRMDevice2 *iface, D3DRMR ...@@ -876,7 +876,7 @@ static HRESULT WINAPI d3drm_device2_SetQuality(IDirect3DRMDevice2 *iface, D3DRMR
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface);
TRACE("iface %p, quality %u.\n", iface, quality); TRACE("iface %p, quality %lu.\n", iface, quality);
return d3drm_device3_SetQuality(&device->IDirect3DRMDevice3_iface, quality); return d3drm_device3_SetQuality(&device->IDirect3DRMDevice3_iface, quality);
} }
...@@ -885,7 +885,7 @@ static HRESULT WINAPI d3drm_device1_SetQuality(IDirect3DRMDevice *iface, D3DRMRE ...@@ -885,7 +885,7 @@ static HRESULT WINAPI d3drm_device1_SetQuality(IDirect3DRMDevice *iface, D3DRMRE
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface);
TRACE("iface %p, quality %u.\n", iface, quality); TRACE("iface %p, quality %lu.\n", iface, quality);
return d3drm_device3_SetQuality(&device->IDirect3DRMDevice3_iface, quality); return d3drm_device3_SetQuality(&device->IDirect3DRMDevice3_iface, quality);
} }
...@@ -1264,7 +1264,7 @@ static HRESULT WINAPI d3drm_device3_SetRenderMode(IDirect3DRMDevice3 *iface, DWO ...@@ -1264,7 +1264,7 @@ static HRESULT WINAPI d3drm_device3_SetRenderMode(IDirect3DRMDevice3 *iface, DWO
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface);
TRACE("iface %p, flags %#x.\n", iface, flags); TRACE("iface %p, flags %#lx.\n", iface, flags);
device->rendermode = flags; device->rendermode = flags;
...@@ -1275,7 +1275,7 @@ static HRESULT WINAPI d3drm_device2_SetRenderMode(IDirect3DRMDevice2 *iface, DWO ...@@ -1275,7 +1275,7 @@ static HRESULT WINAPI d3drm_device2_SetRenderMode(IDirect3DRMDevice2 *iface, DWO
{ {
struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface);
TRACE("iface %p, flags %#x.\n", iface, flags); TRACE("iface %p, flags %#lx.\n", iface, flags);
return d3drm_device3_SetRenderMode(&device->IDirect3DRMDevice3_iface, flags); return d3drm_device3_SetRenderMode(&device->IDirect3DRMDevice3_iface, flags);
} }
...@@ -1325,7 +1325,7 @@ static HRESULT WINAPI d3drm_device2_GetDirect3DDevice2(IDirect3DRMDevice2 *iface ...@@ -1325,7 +1325,7 @@ static HRESULT WINAPI d3drm_device2_GetDirect3DDevice2(IDirect3DRMDevice2 *iface
static HRESULT WINAPI d3drm_device3_FindPreferredTextureFormat(IDirect3DRMDevice3 *iface, static HRESULT WINAPI d3drm_device3_FindPreferredTextureFormat(IDirect3DRMDevice3 *iface,
DWORD bitdepths, DWORD flags, DDPIXELFORMAT *pf) DWORD bitdepths, DWORD flags, DDPIXELFORMAT *pf)
{ {
FIXME("iface %p, bitdepths %u, flags %#x, pf %p stub!\n", iface, bitdepths, flags, pf); FIXME("iface %p, bitdepths %lu, flags %#lx, pf %p stub!\n", iface, bitdepths, flags, pf);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1333,7 +1333,7 @@ static HRESULT WINAPI d3drm_device3_FindPreferredTextureFormat(IDirect3DRMDevice ...@@ -1333,7 +1333,7 @@ static HRESULT WINAPI d3drm_device3_FindPreferredTextureFormat(IDirect3DRMDevice
static HRESULT WINAPI d3drm_device3_RenderStateChange(IDirect3DRMDevice3 *iface, static HRESULT WINAPI d3drm_device3_RenderStateChange(IDirect3DRMDevice3 *iface,
D3DRENDERSTATETYPE state, DWORD value, DWORD flags) D3DRENDERSTATETYPE state, DWORD value, DWORD flags)
{ {
FIXME("iface %p, state %#x, value %#x, flags %#x stub!\n", iface, state, value, flags); FIXME("iface %p, state %#x, value %#lx, flags %#lx stub!\n", iface, state, value, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1341,7 +1341,7 @@ static HRESULT WINAPI d3drm_device3_RenderStateChange(IDirect3DRMDevice3 *iface, ...@@ -1341,7 +1341,7 @@ static HRESULT WINAPI d3drm_device3_RenderStateChange(IDirect3DRMDevice3 *iface,
static HRESULT WINAPI d3drm_device3_LightStateChange(IDirect3DRMDevice3 *iface, static HRESULT WINAPI d3drm_device3_LightStateChange(IDirect3DRMDevice3 *iface,
D3DLIGHTSTATETYPE state, DWORD value, DWORD flags) D3DLIGHTSTATETYPE state, DWORD value, DWORD flags)
{ {
FIXME("iface %p, state %#x, value %#x, flags %#x stub!\n", iface, state, value, flags); FIXME("iface %p, state %#x, value %#lx, flags %#lx stub!\n", iface, state, value, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1349,7 +1349,7 @@ static HRESULT WINAPI d3drm_device3_LightStateChange(IDirect3DRMDevice3 *iface, ...@@ -1349,7 +1349,7 @@ static HRESULT WINAPI d3drm_device3_LightStateChange(IDirect3DRMDevice3 *iface,
static HRESULT WINAPI d3drm_device3_GetStateChangeOptions(IDirect3DRMDevice3 *iface, static HRESULT WINAPI d3drm_device3_GetStateChangeOptions(IDirect3DRMDevice3 *iface,
DWORD state_class, DWORD state_idx, DWORD *flags) DWORD state_class, DWORD state_idx, DWORD *flags)
{ {
FIXME("iface %p, state_class %#x, state_idx %#x, flags %p stub!\n", FIXME("iface %p, state_class %#lx, state_idx %#lx, flags %p stub!\n",
iface, state_class, state_idx, flags); iface, state_class, state_idx, flags);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -1358,7 +1358,7 @@ static HRESULT WINAPI d3drm_device3_GetStateChangeOptions(IDirect3DRMDevice3 *if ...@@ -1358,7 +1358,7 @@ static HRESULT WINAPI d3drm_device3_GetStateChangeOptions(IDirect3DRMDevice3 *if
static HRESULT WINAPI d3drm_device3_SetStateChangeOptions(IDirect3DRMDevice3 *iface, static HRESULT WINAPI d3drm_device3_SetStateChangeOptions(IDirect3DRMDevice3 *iface,
DWORD state_class, DWORD state_idx, DWORD flags) DWORD state_class, DWORD state_idx, DWORD flags)
{ {
FIXME("iface %p, state_class %#x, state_idx %#x, flags %#x stub!\n", FIXME("iface %p, state_class %#lx, state_idx %#lx, flags %#lx stub!\n",
iface, state_class, state_idx, flags); iface, state_class, state_idx, flags);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -1550,7 +1550,7 @@ static HRESULT WINAPI d3drm_device_win_SetAppData(IDirect3DRMWinDevice *iface, D ...@@ -1550,7 +1550,7 @@ static HRESULT WINAPI d3drm_device_win_SetAppData(IDirect3DRMWinDevice *iface, D
{ {
struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data); return d3drm_device3_SetAppData(&device->IDirect3DRMDevice3_iface, data);
} }
......
dlls/d3drm/face.c
View file @ c699803f
...@@ -64,7 +64,7 @@ static ULONG WINAPI d3drm_face1_AddRef(IDirect3DRMFace *iface) ...@@ -64,7 +64,7 @@ static ULONG WINAPI d3drm_face1_AddRef(IDirect3DRMFace *iface)
struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); struct d3drm_face *face = impl_from_IDirect3DRMFace(iface);
ULONG refcount = InterlockedIncrement(&face->ref); ULONG refcount = InterlockedIncrement(&face->ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -74,7 +74,7 @@ static ULONG WINAPI d3drm_face1_Release(IDirect3DRMFace *iface) ...@@ -74,7 +74,7 @@ static ULONG WINAPI d3drm_face1_Release(IDirect3DRMFace *iface)
struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); struct d3drm_face *face = impl_from_IDirect3DRMFace(iface);
ULONG refcount = InterlockedDecrement(&face->ref); ULONG refcount = InterlockedDecrement(&face->ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -117,7 +117,7 @@ static HRESULT WINAPI d3drm_face2_SetAppData(IDirect3DRMFace2 *iface, DWORD data ...@@ -117,7 +117,7 @@ static HRESULT WINAPI d3drm_face2_SetAppData(IDirect3DRMFace2 *iface, DWORD data
{ {
struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface); struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
face->obj.appdata = data; face->obj.appdata = data;
...@@ -128,7 +128,7 @@ static HRESULT WINAPI d3drm_face1_SetAppData(IDirect3DRMFace *iface, DWORD data) ...@@ -128,7 +128,7 @@ static HRESULT WINAPI d3drm_face1_SetAppData(IDirect3DRMFace *iface, DWORD data)
{ {
struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); struct d3drm_face *face = impl_from_IDirect3DRMFace(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
return d3drm_face2_SetAppData(&face->IDirect3DRMFace2_iface, data); return d3drm_face2_SetAppData(&face->IDirect3DRMFace2_iface, data);
} }
...@@ -206,7 +206,7 @@ static HRESULT WINAPI d3drm_face1_AddVertex(IDirect3DRMFace *iface, D3DVALUE x, ...@@ -206,7 +206,7 @@ static HRESULT WINAPI d3drm_face1_AddVertex(IDirect3DRMFace *iface, D3DVALUE x,
static HRESULT WINAPI d3drm_face1_AddVertexAndNormalIndexed(IDirect3DRMFace *iface, static HRESULT WINAPI d3drm_face1_AddVertexAndNormalIndexed(IDirect3DRMFace *iface,
DWORD vertex, DWORD normal) DWORD vertex, DWORD normal)
{ {
FIXME("iface %p, vertex %u, normal %u stub!\n", iface, vertex, normal); FIXME("iface %p, vertex %lu, normal %lu stub!\n", iface, vertex, normal);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -236,7 +236,7 @@ static HRESULT WINAPI d3drm_face2_SetColor(IDirect3DRMFace2 *iface, D3DCOLOR col ...@@ -236,7 +236,7 @@ static HRESULT WINAPI d3drm_face2_SetColor(IDirect3DRMFace2 *iface, D3DCOLOR col
{ {
struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface); struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface);
TRACE("iface %p, color 0x%08x.\n", iface, color); TRACE("iface %p, color 0x%08lx.\n", iface, color);
face->color = color; face->color = color;
...@@ -247,7 +247,7 @@ static HRESULT WINAPI d3drm_face1_SetColor(IDirect3DRMFace *iface, D3DCOLOR colo ...@@ -247,7 +247,7 @@ static HRESULT WINAPI d3drm_face1_SetColor(IDirect3DRMFace *iface, D3DCOLOR colo
{ {
struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); struct d3drm_face *face = impl_from_IDirect3DRMFace(iface);
TRACE("iface %p, color 0x%08x.\n", iface, color); TRACE("iface %p, color 0x%08lx.\n", iface, color);
return d3drm_face2_SetColor(&face->IDirect3DRMFace2_iface, color); return d3drm_face2_SetColor(&face->IDirect3DRMFace2_iface, color);
} }
...@@ -262,7 +262,7 @@ static HRESULT WINAPI d3drm_face1_SetTexture(IDirect3DRMFace *iface, IDirect3DRM ...@@ -262,7 +262,7 @@ static HRESULT WINAPI d3drm_face1_SetTexture(IDirect3DRMFace *iface, IDirect3DRM
static HRESULT WINAPI d3drm_face1_SetTextureCoordinates(IDirect3DRMFace *iface, static HRESULT WINAPI d3drm_face1_SetTextureCoordinates(IDirect3DRMFace *iface,
DWORD vertex, D3DVALUE u, D3DVALUE v) DWORD vertex, D3DVALUE u, D3DVALUE v)
{ {
FIXME("iface %p, vertex %u, u %.8e, v %.8e stub!\n", iface, vertex, u, v); FIXME("iface %p, vertex %lu, u %.8e, v %.8e stub!\n", iface, vertex, u, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -284,7 +284,7 @@ static HRESULT WINAPI d3drm_face1_SetTextureTopology(IDirect3DRMFace *iface, BOO ...@@ -284,7 +284,7 @@ static HRESULT WINAPI d3drm_face1_SetTextureTopology(IDirect3DRMFace *iface, BOO
static HRESULT WINAPI d3drm_face1_GetVertex(IDirect3DRMFace *iface, static HRESULT WINAPI d3drm_face1_GetVertex(IDirect3DRMFace *iface,
DWORD index, D3DVECTOR *vertex, D3DVECTOR *normal) DWORD index, D3DVECTOR *vertex, D3DVECTOR *normal)
{ {
FIXME("iface %p, index %u, vertex %p, normal %p stub!\n", iface, index, vertex, normal); FIXME("iface %p, index %lu, vertex %p, normal %p stub!\n", iface, index, vertex, normal);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -301,7 +301,7 @@ static HRESULT WINAPI d3drm_face1_GetVertices(IDirect3DRMFace *iface, ...@@ -301,7 +301,7 @@ static HRESULT WINAPI d3drm_face1_GetVertices(IDirect3DRMFace *iface,
static HRESULT WINAPI d3drm_face1_GetTextureCoordinates(IDirect3DRMFace *iface, static HRESULT WINAPI d3drm_face1_GetTextureCoordinates(IDirect3DRMFace *iface,
DWORD vertex, D3DVALUE *u, D3DVALUE *v) DWORD vertex, D3DVALUE *u, D3DVALUE *v)
{ {
FIXME("iface %p, vertex %u, u %p, v %p stub!\n", iface, vertex, u, v); FIXME("iface %p, vertex %lu, u %p, v %p stub!\n", iface, vertex, u, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -343,14 +343,14 @@ static int WINAPI d3drm_face1_GetVertexCount(IDirect3DRMFace *iface) ...@@ -343,14 +343,14 @@ static int WINAPI d3drm_face1_GetVertexCount(IDirect3DRMFace *iface)
static int WINAPI d3drm_face1_GetVertexIndex(IDirect3DRMFace *iface, DWORD which) static int WINAPI d3drm_face1_GetVertexIndex(IDirect3DRMFace *iface, DWORD which)
{ {
FIXME("iface %p, which %u stub!\n", iface, which); FIXME("iface %p, which %lu stub!\n", iface, which);
return 0; return 0;
} }
static int WINAPI d3drm_face1_GetTextureCoordinateIndex(IDirect3DRMFace *iface, DWORD which) static int WINAPI d3drm_face1_GetTextureCoordinateIndex(IDirect3DRMFace *iface, DWORD which)
{ {
FIXME("iface %p, which %u stub!\n", iface, which); FIXME("iface %p, which %lu stub!\n", iface, which);
return 0; return 0;
} }
...@@ -475,7 +475,7 @@ static HRESULT WINAPI d3drm_face2_AddVertex(IDirect3DRMFace2 *iface, D3DVALUE x, ...@@ -475,7 +475,7 @@ static HRESULT WINAPI d3drm_face2_AddVertex(IDirect3DRMFace2 *iface, D3DVALUE x,
static HRESULT WINAPI d3drm_face2_AddVertexAndNormalIndexed(IDirect3DRMFace2 *iface, static HRESULT WINAPI d3drm_face2_AddVertexAndNormalIndexed(IDirect3DRMFace2 *iface,
DWORD vertex, DWORD normal) DWORD vertex, DWORD normal)
{ {
FIXME("iface %p, vertex %u, normal %u stub!\n", iface, vertex, normal); FIXME("iface %p, vertex %lu, normal %lu stub!\n", iface, vertex, normal);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -490,7 +490,7 @@ static HRESULT WINAPI d3drm_face2_SetTexture(IDirect3DRMFace2 *iface, IDirect3DR ...@@ -490,7 +490,7 @@ static HRESULT WINAPI d3drm_face2_SetTexture(IDirect3DRMFace2 *iface, IDirect3DR
static HRESULT WINAPI d3drm_face2_SetTextureCoordinates(IDirect3DRMFace2 *iface, static HRESULT WINAPI d3drm_face2_SetTextureCoordinates(IDirect3DRMFace2 *iface,
DWORD vertex, D3DVALUE u, D3DVALUE v) DWORD vertex, D3DVALUE u, D3DVALUE v)
{ {
FIXME("iface %p, vertex %u, u %.8e, v %.8e stub!\n", iface, vertex, u, v); FIXME("iface %p, vertex %lu, u %.8e, v %.8e stub!\n", iface, vertex, u, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -512,7 +512,7 @@ static HRESULT WINAPI d3drm_face2_SetTextureTopology(IDirect3DRMFace2 *iface, BO ...@@ -512,7 +512,7 @@ static HRESULT WINAPI d3drm_face2_SetTextureTopology(IDirect3DRMFace2 *iface, BO
static HRESULT WINAPI d3drm_face2_GetVertex(IDirect3DRMFace2 *iface, static HRESULT WINAPI d3drm_face2_GetVertex(IDirect3DRMFace2 *iface,
DWORD index, D3DVECTOR *vertex, D3DVECTOR *normal) DWORD index, D3DVECTOR *vertex, D3DVECTOR *normal)
{ {
FIXME("iface %p, index %u, vertex %p, normal %p stub!\n", iface, index, vertex, normal); FIXME("iface %p, index %lu, vertex %p, normal %p stub!\n", iface, index, vertex, normal);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -529,7 +529,7 @@ static HRESULT WINAPI d3drm_face2_GetVertices(IDirect3DRMFace2 *iface, ...@@ -529,7 +529,7 @@ static HRESULT WINAPI d3drm_face2_GetVertices(IDirect3DRMFace2 *iface,
static HRESULT WINAPI d3drm_face2_GetTextureCoordinates(IDirect3DRMFace2 *iface, static HRESULT WINAPI d3drm_face2_GetTextureCoordinates(IDirect3DRMFace2 *iface,
DWORD vertex, D3DVALUE *u, D3DVALUE *v) DWORD vertex, D3DVALUE *u, D3DVALUE *v)
{ {
FIXME("iface %p, vertex %u, u %p, v %p stub!\n", iface, vertex, u, v); FIXME("iface %p, vertex %lu, u %p, v %p stub!\n", iface, vertex, u, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -571,14 +571,14 @@ static int WINAPI d3drm_face2_GetVertexCount(IDirect3DRMFace2 *iface) ...@@ -571,14 +571,14 @@ static int WINAPI d3drm_face2_GetVertexCount(IDirect3DRMFace2 *iface)
static int WINAPI d3drm_face2_GetVertexIndex(IDirect3DRMFace2 *iface, DWORD which) static int WINAPI d3drm_face2_GetVertexIndex(IDirect3DRMFace2 *iface, DWORD which)
{ {
FIXME("iface %p, which %u stub!\n", iface, which); FIXME("iface %p, which %lu stub!\n", iface, which);
return 0; return 0;
} }
static int WINAPI d3drm_face2_GetTextureCoordinateIndex(IDirect3DRMFace2 *iface, DWORD which) static int WINAPI d3drm_face2_GetTextureCoordinateIndex(IDirect3DRMFace2 *iface, DWORD which)
{ {
FIXME("iface %p, which %u stub!\n", iface, which); FIXME("iface %p, which %lu stub!\n", iface, which);
return 0; return 0;
} }
......
dlls/d3drm/light.c
View file @ c699803f
...@@ -51,7 +51,7 @@ static ULONG WINAPI d3drm_light_AddRef(IDirect3DRMLight *iface) ...@@ -51,7 +51,7 @@ static ULONG WINAPI d3drm_light_AddRef(IDirect3DRMLight *iface)
struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); struct d3drm_light *light = impl_from_IDirect3DRMLight(iface);
ULONG refcount = InterlockedIncrement(&light->ref); ULONG refcount = InterlockedIncrement(&light->ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -61,7 +61,7 @@ static ULONG WINAPI d3drm_light_Release(IDirect3DRMLight *iface) ...@@ -61,7 +61,7 @@ static ULONG WINAPI d3drm_light_Release(IDirect3DRMLight *iface)
struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); struct d3drm_light *light = impl_from_IDirect3DRMLight(iface);
ULONG refcount = InterlockedDecrement(&light->ref); ULONG refcount = InterlockedDecrement(&light->ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -105,7 +105,7 @@ static HRESULT WINAPI d3drm_light_SetAppData(IDirect3DRMLight *iface, DWORD data ...@@ -105,7 +105,7 @@ static HRESULT WINAPI d3drm_light_SetAppData(IDirect3DRMLight *iface, DWORD data
{ {
struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); struct d3drm_light *light = impl_from_IDirect3DRMLight(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
light->obj.appdata = data; light->obj.appdata = data;
...@@ -163,7 +163,7 @@ static HRESULT WINAPI d3drm_light_SetColor(IDirect3DRMLight *iface, D3DCOLOR col ...@@ -163,7 +163,7 @@ static HRESULT WINAPI d3drm_light_SetColor(IDirect3DRMLight *iface, D3DCOLOR col
{ {
struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); struct d3drm_light *light = impl_from_IDirect3DRMLight(iface);
TRACE("iface %p, color 0x%08x.\n", iface, color); TRACE("iface %p, color 0x%08lx.\n", iface, color);
light->color = 0xff000000 | color; light->color = 0xff000000 | color;
......
dlls/d3drm/material.c
View file @ c699803f
...@@ -52,7 +52,7 @@ static ULONG WINAPI d3drm_material_AddRef(IDirect3DRMMaterial2 *iface) ...@@ -52,7 +52,7 @@ static ULONG WINAPI d3drm_material_AddRef(IDirect3DRMMaterial2 *iface)
struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface); struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface);
ULONG refcount = InterlockedIncrement(&material->ref); ULONG refcount = InterlockedIncrement(&material->ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -62,7 +62,7 @@ static ULONG WINAPI d3drm_material_Release(IDirect3DRMMaterial2 *iface) ...@@ -62,7 +62,7 @@ static ULONG WINAPI d3drm_material_Release(IDirect3DRMMaterial2 *iface)
struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface); struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface);
ULONG refcount = InterlockedDecrement(&material->ref); ULONG refcount = InterlockedDecrement(&material->ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -106,7 +106,7 @@ static HRESULT WINAPI d3drm_material_SetAppData(IDirect3DRMMaterial2 *iface, DWO ...@@ -106,7 +106,7 @@ static HRESULT WINAPI d3drm_material_SetAppData(IDirect3DRMMaterial2 *iface, DWO
{ {
struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface); struct d3drm_material *material = impl_from_IDirect3DRMMaterial2(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
material->obj.appdata = data; material->obj.appdata = data;
......
dlls/d3drm/texture.c
View file @ c699803f
...@@ -409,7 +409,7 @@ static HRESULT WINAPI d3drm_texture1_SetAppData(IDirect3DRMTexture *iface, DWORD ...@@ -409,7 +409,7 @@ static HRESULT WINAPI d3drm_texture1_SetAppData(IDirect3DRMTexture *iface, DWORD
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
return IDirect3DRMTexture3_SetAppData(&texture->IDirect3DRMTexture3_iface, data); return IDirect3DRMTexture3_SetAppData(&texture->IDirect3DRMTexture3_iface, data);
} }
...@@ -492,7 +492,7 @@ static HRESULT WINAPI d3drm_texture1_SetColors(IDirect3DRMTexture *iface, DWORD ...@@ -492,7 +492,7 @@ static HRESULT WINAPI d3drm_texture1_SetColors(IDirect3DRMTexture *iface, DWORD
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface);
TRACE("iface %p, max_colors %u.\n", iface, max_colors); TRACE("iface %p, max_colors %lu.\n", iface, max_colors);
return IDirect3DRMTexture3_SetColors(&texture->IDirect3DRMTexture3_iface, max_colors); return IDirect3DRMTexture3_SetColors(&texture->IDirect3DRMTexture3_iface, max_colors);
} }
...@@ -501,7 +501,7 @@ static HRESULT WINAPI d3drm_texture1_SetShades(IDirect3DRMTexture *iface, DWORD ...@@ -501,7 +501,7 @@ static HRESULT WINAPI d3drm_texture1_SetShades(IDirect3DRMTexture *iface, DWORD
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface);
TRACE("iface %p, max_shades %u.\n", iface, max_shades); TRACE("iface %p, max_shades %lu.\n", iface, max_shades);
return IDirect3DRMTexture3_SetShades(&texture->IDirect3DRMTexture3_iface, max_shades); return IDirect3DRMTexture3_SetShades(&texture->IDirect3DRMTexture3_iface, max_shades);
} }
...@@ -519,7 +519,7 @@ static HRESULT WINAPI d3drm_texture1_SetDecalOrigin(IDirect3DRMTexture *iface, L ...@@ -519,7 +519,7 @@ static HRESULT WINAPI d3drm_texture1_SetDecalOrigin(IDirect3DRMTexture *iface, L
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface);
TRACE("iface %p, x %d, y %d.\n", iface, x, y); TRACE("iface %p, x %ld, y %ld.\n", iface, x, y);
return IDirect3DRMTexture3_SetDecalOrigin(&texture->IDirect3DRMTexture3_iface, x, y); return IDirect3DRMTexture3_SetDecalOrigin(&texture->IDirect3DRMTexture3_iface, x, y);
} }
...@@ -528,7 +528,7 @@ static HRESULT WINAPI d3drm_texture1_SetDecalScale(IDirect3DRMTexture *iface, DW ...@@ -528,7 +528,7 @@ static HRESULT WINAPI d3drm_texture1_SetDecalScale(IDirect3DRMTexture *iface, DW
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface);
TRACE("iface %p, scale %u.\n", iface, scale); TRACE("iface %p, scale %lu.\n", iface, scale);
return IDirect3DRMTexture3_SetDecalScale(&texture->IDirect3DRMTexture3_iface, scale); return IDirect3DRMTexture3_SetDecalScale(&texture->IDirect3DRMTexture3_iface, scale);
} }
...@@ -546,7 +546,7 @@ static HRESULT WINAPI d3drm_texture1_SetDecalTransparentColor(IDirect3DRMTexture ...@@ -546,7 +546,7 @@ static HRESULT WINAPI d3drm_texture1_SetDecalTransparentColor(IDirect3DRMTexture
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface);
TRACE("iface %p, color 0x%08x.\n", iface, color); TRACE("iface %p, color 0x%08lx.\n", iface, color);
return IDirect3DRMTexture3_SetDecalTransparentColor(&texture->IDirect3DRMTexture3_iface, color); return IDirect3DRMTexture3_SetDecalTransparentColor(&texture->IDirect3DRMTexture3_iface, color);
} }
...@@ -718,7 +718,7 @@ static HRESULT WINAPI d3drm_texture2_SetAppData(IDirect3DRMTexture2 *iface, DWOR ...@@ -718,7 +718,7 @@ static HRESULT WINAPI d3drm_texture2_SetAppData(IDirect3DRMTexture2 *iface, DWOR
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
return IDirect3DRMTexture3_SetAppData(&texture->IDirect3DRMTexture3_iface, data); return IDirect3DRMTexture3_SetAppData(&texture->IDirect3DRMTexture3_iface, data);
} }
...@@ -796,7 +796,7 @@ static HRESULT WINAPI d3drm_texture2_SetColors(IDirect3DRMTexture2 *iface, DWORD ...@@ -796,7 +796,7 @@ static HRESULT WINAPI d3drm_texture2_SetColors(IDirect3DRMTexture2 *iface, DWORD
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface);
TRACE("iface %p, max_colors %u.\n", iface, max_colors); TRACE("iface %p, max_colors %lu.\n", iface, max_colors);
return IDirect3DRMTexture3_SetColors(&texture->IDirect3DRMTexture3_iface, max_colors); return IDirect3DRMTexture3_SetColors(&texture->IDirect3DRMTexture3_iface, max_colors);
} }
...@@ -805,7 +805,7 @@ static HRESULT WINAPI d3drm_texture2_SetShades(IDirect3DRMTexture2 *iface, DWORD ...@@ -805,7 +805,7 @@ static HRESULT WINAPI d3drm_texture2_SetShades(IDirect3DRMTexture2 *iface, DWORD
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface);
TRACE("iface %p, max_shades %u.\n", iface, max_shades); TRACE("iface %p, max_shades %lu.\n", iface, max_shades);
return IDirect3DRMTexture3_SetShades(&texture->IDirect3DRMTexture3_iface, max_shades); return IDirect3DRMTexture3_SetShades(&texture->IDirect3DRMTexture3_iface, max_shades);
} }
...@@ -823,7 +823,7 @@ static HRESULT WINAPI d3drm_texture2_SetDecalOrigin(IDirect3DRMTexture2 *iface, ...@@ -823,7 +823,7 @@ static HRESULT WINAPI d3drm_texture2_SetDecalOrigin(IDirect3DRMTexture2 *iface,
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface);
TRACE("iface %p, x %d, y %d.\n", iface, x, y); TRACE("iface %p, x %ld, y %ld.\n", iface, x, y);
return IDirect3DRMTexture3_SetDecalOrigin(&texture->IDirect3DRMTexture3_iface, x, y); return IDirect3DRMTexture3_SetDecalOrigin(&texture->IDirect3DRMTexture3_iface, x, y);
} }
...@@ -832,7 +832,7 @@ static HRESULT WINAPI d3drm_texture2_SetDecalScale(IDirect3DRMTexture2 *iface, D ...@@ -832,7 +832,7 @@ static HRESULT WINAPI d3drm_texture2_SetDecalScale(IDirect3DRMTexture2 *iface, D
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface);
TRACE("iface %p, scale %u.\n", iface, scale); TRACE("iface %p, scale %lu.\n", iface, scale);
return IDirect3DRMTexture3_SetDecalScale(&texture->IDirect3DRMTexture3_iface, scale); return IDirect3DRMTexture3_SetDecalScale(&texture->IDirect3DRMTexture3_iface, scale);
} }
...@@ -850,7 +850,7 @@ static HRESULT WINAPI d3drm_texture2_SetDecalTransparentColor(IDirect3DRMTexture ...@@ -850,7 +850,7 @@ static HRESULT WINAPI d3drm_texture2_SetDecalTransparentColor(IDirect3DRMTexture
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface);
TRACE("iface %p, color 0x%08x.\n", iface, color); TRACE("iface %p, color 0x%08lx.\n", iface, color);
return IDirect3DRMTexture3_SetDecalTransparentColor(&texture->IDirect3DRMTexture3_iface, color); return IDirect3DRMTexture3_SetDecalTransparentColor(&texture->IDirect3DRMTexture3_iface, color);
} }
...@@ -949,7 +949,7 @@ static HRESULT WINAPI d3drm_texture2_GenerateMIPMap(IDirect3DRMTexture2 *iface, ...@@ -949,7 +949,7 @@ static HRESULT WINAPI d3drm_texture2_GenerateMIPMap(IDirect3DRMTexture2 *iface,
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface);
TRACE("iface %p, flags %#x.\n", iface, flags); TRACE("iface %p, flags %#lx.\n", iface, flags);
return IDirect3DRMTexture3_GenerateMIPMap(&texture->IDirect3DRMTexture3_iface, flags); return IDirect3DRMTexture3_GenerateMIPMap(&texture->IDirect3DRMTexture3_iface, flags);
} }
...@@ -1028,7 +1028,7 @@ static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface) ...@@ -1028,7 +1028,7 @@ static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface)
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface);
ULONG refcount = InterlockedIncrement(&texture->obj.ref); ULONG refcount = InterlockedIncrement(&texture->obj.ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -1038,7 +1038,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) ...@@ -1038,7 +1038,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface)
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface);
ULONG refcount = InterlockedDecrement(&texture->obj.ref); ULONG refcount = InterlockedDecrement(&texture->obj.ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
d3drm_texture_destroy(texture); d3drm_texture_destroy(texture);
...@@ -1078,7 +1078,7 @@ static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWOR ...@@ -1078,7 +1078,7 @@ static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWOR
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
texture->obj.appdata = data; texture->obj.appdata = data;
...@@ -1166,21 +1166,21 @@ static HRESULT WINAPI d3drm_texture3_InitFromResource(IDirect3DRMTexture3 *iface ...@@ -1166,21 +1166,21 @@ static HRESULT WINAPI d3drm_texture3_InitFromResource(IDirect3DRMTexture3 *iface
static HRESULT WINAPI d3drm_texture3_Changed(IDirect3DRMTexture3 *iface, static HRESULT WINAPI d3drm_texture3_Changed(IDirect3DRMTexture3 *iface,
DWORD flags, DWORD rect_count, RECT *rects) DWORD flags, DWORD rect_count, RECT *rects)
{ {
FIXME("iface %p, flags %#x, rect_count %u, rects %p stub!\n", iface, flags, rect_count, rects); FIXME("iface %p, flags %#lx, rect_count %lu, rects %p stub!\n", iface, flags, rect_count, rects);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI d3drm_texture3_SetColors(IDirect3DRMTexture3 *iface, DWORD max_colors) static HRESULT WINAPI d3drm_texture3_SetColors(IDirect3DRMTexture3 *iface, DWORD max_colors)
{ {
FIXME("iface %p, max_colors %u stub!\n", iface, max_colors); FIXME("iface %p, max_colors %lu stub!\n", iface, max_colors);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI d3drm_texture3_SetShades(IDirect3DRMTexture3 *iface, DWORD max_shades) static HRESULT WINAPI d3drm_texture3_SetShades(IDirect3DRMTexture3 *iface, DWORD max_shades)
{ {
FIXME("iface %p, max_shades %u stub!\n", iface, max_shades); FIXME("iface %p, max_shades %lu stub!\n", iface, max_shades);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1194,14 +1194,14 @@ static HRESULT WINAPI d3drm_texture3_SetDecalSize(IDirect3DRMTexture3 *iface, D3 ...@@ -1194,14 +1194,14 @@ static HRESULT WINAPI d3drm_texture3_SetDecalSize(IDirect3DRMTexture3 *iface, D3
static HRESULT WINAPI d3drm_texture3_SetDecalOrigin(IDirect3DRMTexture3 *iface, LONG x, LONG y) static HRESULT WINAPI d3drm_texture3_SetDecalOrigin(IDirect3DRMTexture3 *iface, LONG x, LONG y)
{ {
FIXME("iface %p, x %d, y %d stub!\n", iface, x, y); FIXME("iface %p, x %ld, y %ld stub!\n", iface, x, y);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI d3drm_texture3_SetDecalScale(IDirect3DRMTexture3 *iface, DWORD scale) static HRESULT WINAPI d3drm_texture3_SetDecalScale(IDirect3DRMTexture3 *iface, DWORD scale)
{ {
FIXME("iface %p, scale %u stub!\n", iface, scale); FIXME("iface %p, scale %lu stub!\n", iface, scale);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1215,7 +1215,7 @@ static HRESULT WINAPI d3drm_texture3_SetDecalTransparency(IDirect3DRMTexture3 *i ...@@ -1215,7 +1215,7 @@ static HRESULT WINAPI d3drm_texture3_SetDecalTransparency(IDirect3DRMTexture3 *i
static HRESULT WINAPI d3drm_texture3_SetDecalTransparentColor(IDirect3DRMTexture3 *iface, D3DCOLOR color) static HRESULT WINAPI d3drm_texture3_SetDecalTransparentColor(IDirect3DRMTexture3 *iface, D3DCOLOR color)
{ {
FIXME("iface %p, color 0x%08x stub!\n", iface, color); FIXME("iface %p, color 0x%08lx stub!\n", iface, color);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1309,7 +1309,7 @@ static HRESULT WINAPI d3drm_texture3_InitFromResource2(IDirect3DRMTexture3 *ifac ...@@ -1309,7 +1309,7 @@ static HRESULT WINAPI d3drm_texture3_InitFromResource2(IDirect3DRMTexture3 *ifac
static HRESULT WINAPI d3drm_texture3_GenerateMIPMap(IDirect3DRMTexture3 *iface, DWORD flags) static HRESULT WINAPI d3drm_texture3_GenerateMIPMap(IDirect3DRMTexture3 *iface, DWORD flags)
{ {
FIXME("iface %p, flags %#x stub!\n", iface, flags); FIXME("iface %p, flags %#lx stub!\n", iface, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1319,10 +1319,10 @@ static HRESULT WINAPI d3drm_texture3_GetSurface(IDirect3DRMTexture3 *iface, ...@@ -1319,10 +1319,10 @@ static HRESULT WINAPI d3drm_texture3_GetSurface(IDirect3DRMTexture3 *iface,
{ {
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface);
TRACE("iface %p, flags %#x, surface %p.\n", iface, flags, surface); TRACE("iface %p, flags %#lx, surface %p.\n", iface, flags, surface);
if (flags) if (flags)
FIXME("unexpected flags %#x.\n", flags); FIXME("unexpected flags %#lx.\n", flags);
if (!surface) if (!surface)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -1338,7 +1338,7 @@ static HRESULT WINAPI d3drm_texture3_GetSurface(IDirect3DRMTexture3 *iface, ...@@ -1338,7 +1338,7 @@ static HRESULT WINAPI d3drm_texture3_GetSurface(IDirect3DRMTexture3 *iface,
static HRESULT WINAPI d3drm_texture3_SetCacheOptions(IDirect3DRMTexture3 *iface, LONG importance, DWORD flags) static HRESULT WINAPI d3drm_texture3_SetCacheOptions(IDirect3DRMTexture3 *iface, LONG importance, DWORD flags)
{ {
FIXME("iface %p, importance %d, flags %#x stub!\n", iface, importance, flags); FIXME("iface %p, importance %ld, flags %#lx stub!\n", iface, importance, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/d3drm/viewport.c
View file @ c699803f
...@@ -117,7 +117,7 @@ static ULONG WINAPI d3drm_viewport2_AddRef(IDirect3DRMViewport2 *iface) ...@@ -117,7 +117,7 @@ static ULONG WINAPI d3drm_viewport2_AddRef(IDirect3DRMViewport2 *iface)
struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface);
ULONG refcount = InterlockedIncrement(&viewport->obj.ref); ULONG refcount = InterlockedIncrement(&viewport->obj.ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -136,7 +136,7 @@ static ULONG WINAPI d3drm_viewport2_Release(IDirect3DRMViewport2 *iface) ...@@ -136,7 +136,7 @@ static ULONG WINAPI d3drm_viewport2_Release(IDirect3DRMViewport2 *iface)
struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface);
ULONG refcount = InterlockedDecrement(&viewport->obj.ref); ULONG refcount = InterlockedDecrement(&viewport->obj.ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
d3drm_viewport_destroy(viewport); d3drm_viewport_destroy(viewport);
...@@ -213,7 +213,7 @@ static HRESULT WINAPI d3drm_viewport2_SetAppData(IDirect3DRMViewport2 *iface, DW ...@@ -213,7 +213,7 @@ static HRESULT WINAPI d3drm_viewport2_SetAppData(IDirect3DRMViewport2 *iface, DW
{ {
struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface);
TRACE("iface %p, data %#x\n", iface, data); TRACE("iface %p, data %#lx\n", iface, data);
viewport->obj.appdata = data; viewport->obj.appdata = data;
return S_OK; return S_OK;
...@@ -223,7 +223,7 @@ static HRESULT WINAPI d3drm_viewport1_SetAppData(IDirect3DRMViewport *iface, DWO ...@@ -223,7 +223,7 @@ static HRESULT WINAPI d3drm_viewport1_SetAppData(IDirect3DRMViewport *iface, DWO
{ {
struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface);
TRACE("iface %p, data %#x\n", iface, data); TRACE("iface %p, data %#lx\n", iface, data);
return d3drm_viewport2_SetAppData(&viewport->IDirect3DRMViewport2_iface, data); return d3drm_viewport2_SetAppData(&viewport->IDirect3DRMViewport2_iface, data);
} }
...@@ -313,7 +313,7 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3 ...@@ -313,7 +313,7 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3
D3DMATERIALHANDLE hmat; D3DMATERIALHANDLE hmat;
HRESULT hr = D3DRM_OK; HRESULT hr = D3DRM_OK;
TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u.\n", TRACE("iface %p, device %p, camera %p, x %lu, y %lu, width %lu, height %lu.\n",
iface, device, camera, x, y, width, height); iface, device, camera, x, y, width, height);
if (!device_obj || !camera if (!device_obj || !camera
...@@ -407,7 +407,7 @@ static HRESULT WINAPI d3drm_viewport1_Init(IDirect3DRMViewport *iface, IDirect3D ...@@ -407,7 +407,7 @@ static HRESULT WINAPI d3drm_viewport1_Init(IDirect3DRMViewport *iface, IDirect3D
IDirect3DRMDevice3 *device3; IDirect3DRMDevice3 *device3;
HRESULT hr; HRESULT hr;
TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u.\n", TRACE("iface %p, device %p, camera %p, x %lu, y %lu, width %lu, height %lu.\n",
iface, device, camera, x, y, width, height); iface, device, camera, x, y, width, height);
if (!device || !frame) if (!device || !frame)
...@@ -432,7 +432,7 @@ static HRESULT WINAPI d3drm_viewport2_Clear(IDirect3DRMViewport2 *iface, DWORD f ...@@ -432,7 +432,7 @@ static HRESULT WINAPI d3drm_viewport2_Clear(IDirect3DRMViewport2 *iface, DWORD f
IDirectDrawSurface *ds; IDirectDrawSurface *ds;
DWORD clear_flags = 0; DWORD clear_flags = 0;
TRACE("iface %p, flags %#x.\n", iface, flags); TRACE("iface %p, flags %#lx.\n", iface, flags);
clear_rect.u1.x1 = clear_rect.u2.y1 = 0; clear_rect.u1.x1 = clear_rect.u2.y1 = 0;
clear_rect.u3.x2 = viewport->device->width; clear_rect.u3.x2 = viewport->device->width;
...@@ -661,7 +661,7 @@ static HRESULT WINAPI d3drm_viewport1_InverseTransform(IDirect3DRMViewport *ifac ...@@ -661,7 +661,7 @@ static HRESULT WINAPI d3drm_viewport1_InverseTransform(IDirect3DRMViewport *ifac
static HRESULT WINAPI d3drm_viewport2_Configure(IDirect3DRMViewport2 *iface, static HRESULT WINAPI d3drm_viewport2_Configure(IDirect3DRMViewport2 *iface,
LONG x, LONG y, DWORD width, DWORD height) LONG x, LONG y, DWORD width, DWORD height)
{ {
FIXME("iface %p, x %d, y %d, width %u, height %u stub!\n", iface, x, y, width, height); FIXME("iface %p, x %ld, y %ld, width %lu, height %lu stub!\n", iface, x, y, width, height);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -669,7 +669,7 @@ static HRESULT WINAPI d3drm_viewport2_Configure(IDirect3DRMViewport2 *iface, ...@@ -669,7 +669,7 @@ static HRESULT WINAPI d3drm_viewport2_Configure(IDirect3DRMViewport2 *iface,
static HRESULT WINAPI d3drm_viewport1_Configure(IDirect3DRMViewport *iface, static HRESULT WINAPI d3drm_viewport1_Configure(IDirect3DRMViewport *iface,
LONG x, LONG y, DWORD width, DWORD height) LONG x, LONG y, DWORD width, DWORD height)
{ {
FIXME("iface %p, x %d, y %d, width %u, height %u stub!\n", iface, x, y, width, height); FIXME("iface %p, x %ld, y %ld, width %lu, height %lu stub!\n", iface, x, y, width, height);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -677,7 +677,7 @@ static HRESULT WINAPI d3drm_viewport1_Configure(IDirect3DRMViewport *iface, ...@@ -677,7 +677,7 @@ static HRESULT WINAPI d3drm_viewport1_Configure(IDirect3DRMViewport *iface,
static HRESULT WINAPI d3drm_viewport2_ForceUpdate(IDirect3DRMViewport2* iface, static HRESULT WINAPI d3drm_viewport2_ForceUpdate(IDirect3DRMViewport2* iface,
DWORD x1, DWORD y1, DWORD x2, DWORD y2) DWORD x1, DWORD y1, DWORD x2, DWORD y2)
{ {
FIXME("iface %p, x1 %u, y1 %u, x2 %u, y2 %u stub!\n", iface, x1, y1, x2, y2); FIXME("iface %p, x1 %lu, y1 %lu, x2 %lu, y2 %lu stub!\n", iface, x1, y1, x2, y2);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -685,7 +685,7 @@ static HRESULT WINAPI d3drm_viewport2_ForceUpdate(IDirect3DRMViewport2* iface, ...@@ -685,7 +685,7 @@ static HRESULT WINAPI d3drm_viewport2_ForceUpdate(IDirect3DRMViewport2* iface,
static HRESULT WINAPI d3drm_viewport1_ForceUpdate(IDirect3DRMViewport *iface, static HRESULT WINAPI d3drm_viewport1_ForceUpdate(IDirect3DRMViewport *iface,
DWORD x1, DWORD y1, DWORD x2, DWORD y2) DWORD x1, DWORD y1, DWORD x2, DWORD y2)
{ {
FIXME("iface %p, x1 %u, y1 %u, x2 %u, y2 %u stub!\n", iface, x1, y1, x2, y2); FIXME("iface %p, x1 %lu, y1 %lu, x2 %lu, y2 %lu stub!\n", iface, x1, y1, x2, y2);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -825,7 +825,7 @@ static HRESULT WINAPI d3drm_viewport1_GetPlane(IDirect3DRMViewport *iface, ...@@ -825,7 +825,7 @@ static HRESULT WINAPI d3drm_viewport1_GetPlane(IDirect3DRMViewport *iface,
static HRESULT WINAPI d3drm_viewport2_Pick(IDirect3DRMViewport2 *iface, static HRESULT WINAPI d3drm_viewport2_Pick(IDirect3DRMViewport2 *iface,
LONG x, LONG y, IDirect3DRMPickedArray **visuals) LONG x, LONG y, IDirect3DRMPickedArray **visuals)
{ {
FIXME("iface %p, x %d, y %d, visuals %p stub!\n", iface, x, y, visuals); FIXME("iface %p, x %ld, y %ld, visuals %p stub!\n", iface, x, y, visuals);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -833,7 +833,7 @@ static HRESULT WINAPI d3drm_viewport2_Pick(IDirect3DRMViewport2 *iface, ...@@ -833,7 +833,7 @@ static HRESULT WINAPI d3drm_viewport2_Pick(IDirect3DRMViewport2 *iface,
static HRESULT WINAPI d3drm_viewport1_Pick(IDirect3DRMViewport *iface, static HRESULT WINAPI d3drm_viewport1_Pick(IDirect3DRMViewport *iface,
LONG x, LONG y, IDirect3DRMPickedArray **visuals) LONG x, LONG y, IDirect3DRMPickedArray **visuals)
{ {
FIXME("iface %p, x %d, y %d, visuals %p stub!\n", iface, x, y, visuals); FIXME("iface %p, x %ld, y %ld, visuals %p stub!\n", iface, x, y, visuals);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1025,7 +1025,7 @@ static HRESULT WINAPI d3drm_viewport1_GetDirect3DViewport(IDirect3DRMViewport *i ...@@ -1025,7 +1025,7 @@ static HRESULT WINAPI d3drm_viewport1_GetDirect3DViewport(IDirect3DRMViewport *i
static HRESULT WINAPI d3drm_viewport2_TransformVectors(IDirect3DRMViewport2 *iface, static HRESULT WINAPI d3drm_viewport2_TransformVectors(IDirect3DRMViewport2 *iface,
DWORD vector_count, D3DRMVECTOR4D *dst, D3DVECTOR *src) DWORD vector_count, D3DRMVECTOR4D *dst, D3DVECTOR *src)
{ {
FIXME("iface %p, vector_count %u, dst %p, src %p stub!\n", iface, vector_count, dst, src); FIXME("iface %p, vector_count %lu, dst %p, src %p stub!\n", iface, vector_count, dst, src);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1033,7 +1033,7 @@ static HRESULT WINAPI d3drm_viewport2_TransformVectors(IDirect3DRMViewport2 *ifa ...@@ -1033,7 +1033,7 @@ static HRESULT WINAPI d3drm_viewport2_TransformVectors(IDirect3DRMViewport2 *ifa
static HRESULT WINAPI d3drm_viewport2_InverseTransformVectors(IDirect3DRMViewport2 *iface, static HRESULT WINAPI d3drm_viewport2_InverseTransformVectors(IDirect3DRMViewport2 *iface,
DWORD vector_count, D3DVECTOR *dst, D3DRMVECTOR4D *src) DWORD vector_count, D3DVECTOR *dst, D3DRMVECTOR4D *src)
{ {
FIXME("iface %p, vector_count %u, dst %p, src %p stub!\n", iface, vector_count, dst, src); FIXME("iface %p, vector_count %lu, dst %p, src %p stub!\n", iface, vector_count, dst, src);
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