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
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 242 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/d3drm.c
View file @ c699803f
...@@ -249,7 +249,7 @@ static ULONG WINAPI d3drm1_AddRef(IDirect3DRM *iface) ...@@ -249,7 +249,7 @@ static ULONG WINAPI d3drm1_AddRef(IDirect3DRM *iface)
struct d3drm *d3drm = impl_from_IDirect3DRM(iface); struct d3drm *d3drm = impl_from_IDirect3DRM(iface);
ULONG refcount = InterlockedIncrement(&d3drm->ref1); ULONG refcount = InterlockedIncrement(&d3drm->ref1);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
if (refcount == 1) if (refcount == 1)
InterlockedIncrement(&d3drm->iface_count); InterlockedIncrement(&d3drm->iface_count);
...@@ -262,7 +262,7 @@ static ULONG WINAPI d3drm1_Release(IDirect3DRM *iface) ...@@ -262,7 +262,7 @@ static ULONG WINAPI d3drm1_Release(IDirect3DRM *iface)
struct d3drm *d3drm = impl_from_IDirect3DRM(iface); struct d3drm *d3drm = impl_from_IDirect3DRM(iface);
ULONG refcount = InterlockedDecrement(&d3drm->ref1); ULONG refcount = InterlockedDecrement(&d3drm->ref1);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) if (!refcount && !InterlockedDecrement(&d3drm->iface_count))
d3drm_destroy(d3drm); d3drm_destroy(d3drm);
...@@ -384,7 +384,7 @@ static HRESULT WINAPI d3drm1_CreateLight(IDirect3DRM *iface, ...@@ -384,7 +384,7 @@ static HRESULT WINAPI d3drm1_CreateLight(IDirect3DRM *iface,
{ {
struct d3drm *d3drm = impl_from_IDirect3DRM(iface); struct d3drm *d3drm = impl_from_IDirect3DRM(iface);
TRACE("iface %p, type %#x, color 0x%08x, light %p.\n", iface, type, color, light); TRACE("iface %p, type %#x, color 0x%08lx, light %p.\n", iface, type, color, light);
return IDirect3DRM3_CreateLight(&d3drm->IDirect3DRM3_iface, type, color, light); return IDirect3DRM3_CreateLight(&d3drm->IDirect3DRM3_iface, type, color, light);
} }
...@@ -413,7 +413,7 @@ static HRESULT WINAPI d3drm1_CreateMaterial(IDirect3DRM *iface, ...@@ -413,7 +413,7 @@ static HRESULT WINAPI d3drm1_CreateMaterial(IDirect3DRM *iface,
static HRESULT WINAPI d3drm1_CreateDevice(IDirect3DRM *iface, static HRESULT WINAPI d3drm1_CreateDevice(IDirect3DRM *iface,
DWORD width, DWORD height, IDirect3DRMDevice **device) DWORD width, DWORD height, IDirect3DRMDevice **device)
{ {
TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); TRACE("iface %p, width %lu, height %lu, device %p.\n", iface, width, height, device);
if (!device) if (!device)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -565,7 +565,7 @@ static HRESULT WINAPI d3drm1_CreateViewport(IDirect3DRM *iface, IDirect3DRMDevic ...@@ -565,7 +565,7 @@ static HRESULT WINAPI d3drm1_CreateViewport(IDirect3DRM *iface, IDirect3DRMDevic
IDirect3DRMViewport2 *viewport2; IDirect3DRMViewport2 *viewport2;
HRESULT hr; HRESULT hr;
TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", TRACE("iface %p, device %p, camera %p, x %lu, y %lu, width %lu, height %lu, viewport %p.\n",
iface, device, camera, x, y, width, height, viewport); iface, device, camera, x, y, width, height, viewport);
if (!viewport) if (!viewport)
...@@ -694,14 +694,14 @@ static HRESULT WINAPI d3drm1_GetSearchPath(IDirect3DRM *iface, DWORD *size, char ...@@ -694,14 +694,14 @@ static HRESULT WINAPI d3drm1_GetSearchPath(IDirect3DRM *iface, DWORD *size, char
static HRESULT WINAPI d3drm1_SetDefaultTextureColors(IDirect3DRM *iface, DWORD color_count) static HRESULT WINAPI d3drm1_SetDefaultTextureColors(IDirect3DRM *iface, DWORD color_count)
{ {
FIXME("iface %p, color_count %u stub!\n", iface, color_count); FIXME("iface %p, color_count %lu stub!\n", iface, color_count);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI d3drm1_SetDefaultTextureShades(IDirect3DRM *iface, DWORD shade_count) static HRESULT WINAPI d3drm1_SetDefaultTextureShades(IDirect3DRM *iface, DWORD shade_count)
{ {
FIXME("iface %p, shade_count %u stub!\n", iface, shade_count); FIXME("iface %p, shade_count %lu stub!\n", iface, shade_count);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -736,7 +736,7 @@ static HRESULT WINAPI d3drm1_Load(IDirect3DRM *iface, void *source, void *object ...@@ -736,7 +736,7 @@ static HRESULT WINAPI d3drm1_Load(IDirect3DRM *iface, void *source, void *object
IDirect3DRMFrame3 *parent_frame3 = NULL; IDirect3DRMFrame3 *parent_frame3 = NULL;
HRESULT hr = D3DRM_OK; HRESULT hr = D3DRM_OK;
TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %u, flags %#x, " TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %lu, flags %#lx, "
"load_cb %p, load_ctx %p, load_tex_cb %p, load_tex_ctx %p, parent_frame %p.\n", "load_cb %p, load_ctx %p, load_tex_cb %p, load_tex_ctx %p, parent_frame %p.\n",
iface, source, object_id, iids, iid_count, flags, iface, source, object_id, iids, iid_count, flags,
load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame);
...@@ -810,7 +810,7 @@ static ULONG WINAPI d3drm2_AddRef(IDirect3DRM2 *iface) ...@@ -810,7 +810,7 @@ static ULONG WINAPI d3drm2_AddRef(IDirect3DRM2 *iface)
struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); struct d3drm *d3drm = impl_from_IDirect3DRM2(iface);
ULONG refcount = InterlockedIncrement(&d3drm->ref2); ULONG refcount = InterlockedIncrement(&d3drm->ref2);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
if (refcount == 1) if (refcount == 1)
InterlockedIncrement(&d3drm->iface_count); InterlockedIncrement(&d3drm->iface_count);
...@@ -823,7 +823,7 @@ static ULONG WINAPI d3drm2_Release(IDirect3DRM2 *iface) ...@@ -823,7 +823,7 @@ static ULONG WINAPI d3drm2_Release(IDirect3DRM2 *iface)
struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); struct d3drm *d3drm = impl_from_IDirect3DRM2(iface);
ULONG refcount = InterlockedDecrement(&d3drm->ref2); ULONG refcount = InterlockedDecrement(&d3drm->ref2);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) if (!refcount && !InterlockedDecrement(&d3drm->iface_count))
d3drm_destroy(d3drm); d3drm_destroy(d3drm);
...@@ -938,7 +938,7 @@ static HRESULT WINAPI d3drm2_CreateLight(IDirect3DRM2 *iface, ...@@ -938,7 +938,7 @@ static HRESULT WINAPI d3drm2_CreateLight(IDirect3DRM2 *iface,
{ {
struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); struct d3drm *d3drm = impl_from_IDirect3DRM2(iface);
TRACE("iface %p, type %#x, color 0x%08x, light %p.\n", iface, type, color, light); TRACE("iface %p, type %#x, color 0x%08lx, light %p.\n", iface, type, color, light);
return IDirect3DRM3_CreateLight(&d3drm->IDirect3DRM3_iface, type, color, light); return IDirect3DRM3_CreateLight(&d3drm->IDirect3DRM3_iface, type, color, light);
} }
...@@ -967,7 +967,7 @@ static HRESULT WINAPI d3drm2_CreateMaterial(IDirect3DRM2 *iface, ...@@ -967,7 +967,7 @@ static HRESULT WINAPI d3drm2_CreateMaterial(IDirect3DRM2 *iface,
static HRESULT WINAPI d3drm2_CreateDevice(IDirect3DRM2 *iface, static HRESULT WINAPI d3drm2_CreateDevice(IDirect3DRM2 *iface,
DWORD width, DWORD height, IDirect3DRMDevice2 **device) DWORD width, DWORD height, IDirect3DRMDevice2 **device)
{ {
TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); TRACE("iface %p, width %lu, height %lu, device %p.\n", iface, width, height, device);
if (!device) if (!device)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -1089,7 +1089,7 @@ static HRESULT WINAPI d3drm2_CreateViewport(IDirect3DRM2 *iface, IDirect3DRMDevi ...@@ -1089,7 +1089,7 @@ static HRESULT WINAPI d3drm2_CreateViewport(IDirect3DRM2 *iface, IDirect3DRMDevi
IDirect3DRMViewport2 *viewport2; IDirect3DRMViewport2 *viewport2;
HRESULT hr; HRESULT hr;
TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", TRACE("iface %p, device %p, camera %p, x %lu, y %lu, width %lu, height %lu, viewport %p.\n",
iface, device, camera, x, y, width, height, viewport); iface, device, camera, x, y, width, height, viewport);
if (!viewport) if (!viewport)
...@@ -1208,14 +1208,14 @@ static HRESULT WINAPI d3drm2_GetSearchPath(IDirect3DRM2 *iface, DWORD *size, cha ...@@ -1208,14 +1208,14 @@ static HRESULT WINAPI d3drm2_GetSearchPath(IDirect3DRM2 *iface, DWORD *size, cha
static HRESULT WINAPI d3drm2_SetDefaultTextureColors(IDirect3DRM2 *iface, DWORD color_count) static HRESULT WINAPI d3drm2_SetDefaultTextureColors(IDirect3DRM2 *iface, DWORD color_count)
{ {
FIXME("iface %p, color_count %u stub!\n", iface, color_count); FIXME("iface %p, color_count %lu stub!\n", iface, color_count);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI d3drm2_SetDefaultTextureShades(IDirect3DRM2 *iface, DWORD shade_count) static HRESULT WINAPI d3drm2_SetDefaultTextureShades(IDirect3DRM2 *iface, DWORD shade_count)
{ {
FIXME("iface %p, shade_count %u stub!\n", iface, shade_count); FIXME("iface %p, shade_count %lu stub!\n", iface, shade_count);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1250,7 +1250,7 @@ static HRESULT WINAPI d3drm2_Load(IDirect3DRM2 *iface, void *source, void *objec ...@@ -1250,7 +1250,7 @@ static HRESULT WINAPI d3drm2_Load(IDirect3DRM2 *iface, void *source, void *objec
IDirect3DRMFrame3 *parent_frame3 = NULL; IDirect3DRMFrame3 *parent_frame3 = NULL;
HRESULT hr = D3DRM_OK; HRESULT hr = D3DRM_OK;
TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %u, flags %#x, " TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %lu, flags %#lx, "
"load_cb %p, load_ctx %p, load_tex_cb %p, load_tex_ctx %p, parent_frame %p.\n", "load_cb %p, load_ctx %p, load_tex_cb %p, load_tex_ctx %p, parent_frame %p.\n",
iface, source, object_id, iids, iid_count, flags, iface, source, object_id, iids, iid_count, flags,
load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame);
...@@ -1332,7 +1332,7 @@ static ULONG WINAPI d3drm3_AddRef(IDirect3DRM3 *iface) ...@@ -1332,7 +1332,7 @@ static ULONG WINAPI d3drm3_AddRef(IDirect3DRM3 *iface)
struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); struct d3drm *d3drm = impl_from_IDirect3DRM3(iface);
ULONG refcount = InterlockedIncrement(&d3drm->ref3); ULONG refcount = InterlockedIncrement(&d3drm->ref3);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
if (refcount == 1) if (refcount == 1)
InterlockedIncrement(&d3drm->iface_count); InterlockedIncrement(&d3drm->iface_count);
...@@ -1345,7 +1345,7 @@ static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface) ...@@ -1345,7 +1345,7 @@ static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface)
struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); struct d3drm *d3drm = impl_from_IDirect3DRM3(iface);
ULONG refcount = InterlockedDecrement(&d3drm->ref3); ULONG refcount = InterlockedDecrement(&d3drm->ref3);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) if (!refcount && !InterlockedDecrement(&d3drm->iface_count))
d3drm_destroy(d3drm); d3drm_destroy(d3drm);
...@@ -1549,7 +1549,7 @@ static HRESULT WINAPI d3drm3_CreateLight(IDirect3DRM3 *iface, ...@@ -1549,7 +1549,7 @@ static HRESULT WINAPI d3drm3_CreateLight(IDirect3DRM3 *iface,
struct d3drm_light *object; struct d3drm_light *object;
HRESULT hr; HRESULT hr;
TRACE("iface %p, type %#x, color 0x%08x, light %p.\n", iface, type, color, light); TRACE("iface %p, type %#x, color 0x%08lx, light %p.\n", iface, type, color, light);
if (SUCCEEDED(hr = d3drm_light_create(&object, &d3drm->IDirect3DRM_iface))) if (SUCCEEDED(hr = d3drm_light_create(&object, &d3drm->IDirect3DRM_iface)))
{ {
...@@ -1603,7 +1603,7 @@ static HRESULT WINAPI d3drm3_CreateMaterial(IDirect3DRM3 *iface, ...@@ -1603,7 +1603,7 @@ static HRESULT WINAPI d3drm3_CreateMaterial(IDirect3DRM3 *iface,
static HRESULT WINAPI d3drm3_CreateDevice(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateDevice(IDirect3DRM3 *iface,
DWORD width, DWORD height, IDirect3DRMDevice3 **device) DWORD width, DWORD height, IDirect3DRMDevice3 **device)
{ {
TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); TRACE("iface %p, width %lu, height %lu, device %p.\n", iface, width, height, device);
if (!device) if (!device)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -1620,7 +1620,7 @@ static HRESULT WINAPI d3drm3_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID * ...@@ -1620,7 +1620,7 @@ static HRESULT WINAPI d3drm3_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID *
BOOL use_z_surface; BOOL use_z_surface;
HRESULT hr; HRESULT hr;
TRACE("iface %p, guid %s, ddraw %p, backbuffer %p, flags %#x, device %p.\n", TRACE("iface %p, guid %s, ddraw %p, backbuffer %p, flags %#lx, device %p.\n",
iface, debugstr_guid(guid), ddraw, backbuffer, flags, device); iface, debugstr_guid(guid), ddraw, backbuffer, flags, device);
if (!device) if (!device)
...@@ -1762,7 +1762,7 @@ static HRESULT WINAPI d3drm3_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevi ...@@ -1762,7 +1762,7 @@ static HRESULT WINAPI d3drm3_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevi
struct d3drm_viewport *object; struct d3drm_viewport *object;
HRESULT hr; HRESULT hr;
TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", TRACE("iface %p, device %p, camera %p, x %lu, y %lu, width %lu, height %lu, viewport %p.\n",
iface, device, camera, x, y, width, height, viewport); iface, device, camera, x, y, width, height, viewport);
if (!viewport) if (!viewport)
...@@ -1886,14 +1886,14 @@ static HRESULT WINAPI d3drm3_GetSearchPath(IDirect3DRM3 *iface, DWORD *size, cha ...@@ -1886,14 +1886,14 @@ static HRESULT WINAPI d3drm3_GetSearchPath(IDirect3DRM3 *iface, DWORD *size, cha
static HRESULT WINAPI d3drm3_SetDefaultTextureColors(IDirect3DRM3 *iface, DWORD color_count) static HRESULT WINAPI d3drm3_SetDefaultTextureColors(IDirect3DRM3 *iface, DWORD color_count)
{ {
FIXME("iface %p, color_count %u stub!\n", iface, color_count); FIXME("iface %p, color_count %lu stub!\n", iface, color_count);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI d3drm3_SetDefaultTextureShades(IDirect3DRM3 *iface, DWORD shade_count) static HRESULT WINAPI d3drm3_SetDefaultTextureShades(IDirect3DRM3 *iface, DWORD shade_count)
{ {
FIXME("iface %p, shade_count %u stub!\n", iface, shade_count); FIXME("iface %p, shade_count %lu stub!\n", iface, shade_count);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2121,7 +2121,7 @@ static HRESULT WINAPI d3drm3_Load(IDirect3DRM3 *iface, void *source, void *objec ...@@ -2121,7 +2121,7 @@ static HRESULT WINAPI d3drm3_Load(IDirect3DRM3 *iface, void *source, void *objec
HRESULT ret = D3DRMERR_BADOBJECT; HRESULT ret = D3DRMERR_BADOBJECT;
DWORD i; DWORD i;
TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %u, flags %#x, " TRACE("iface %p, source %p, object_id %p, iids %p, iid_count %lu, flags %#lx, "
"load_cb %p, load_ctx %p, load_tex_cb %p, load_tex_ctx %p, parent_frame %p.\n", "load_cb %p, load_ctx %p, load_tex_cb %p, load_tex_ctx %p, parent_frame %p.\n",
iface, source, object_id, iids, iid_count, flags, iface, source, object_id, iids, iid_count, flags,
load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame);
...@@ -2141,7 +2141,7 @@ static HRESULT WINAPI d3drm3_Load(IDirect3DRM3 *iface, void *source, void *objec ...@@ -2141,7 +2141,7 @@ static HRESULT WINAPI d3drm3_Load(IDirect3DRM3 *iface, void *source, void *objec
} }
else else
{ {
FIXME("Load options %#x not supported yet.\n", flags); FIXME("Load options %#lx not supported yet.\n", flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2177,7 +2177,7 @@ static HRESULT WINAPI d3drm3_Load(IDirect3DRM3 *iface, void *source, void *objec ...@@ -2177,7 +2177,7 @@ static HRESULT WINAPI d3drm3_Load(IDirect3DRM3 *iface, void *source, void *objec
if ((hr != DXFILE_OK) || (size != sizeof(*header))) if ((hr != DXFILE_OK) || (size != sizeof(*header)))
goto end; goto end;
TRACE("Version is %u.%u, flags %#x.\n", header->major, header->minor, header->flags); TRACE("Version is %u.%u, flags %#lx.\n", header->major, header->minor, header->flags);
/* Version must be 1.0.x */ /* Version must be 1.0.x */
if ((header->major != 1) || (header->minor != 0)) if ((header->major != 1) || (header->minor != 0))
...@@ -2262,7 +2262,7 @@ static HRESULT WINAPI d3drm3_CreateClippedVisual(IDirect3DRM3 *iface, ...@@ -2262,7 +2262,7 @@ static HRESULT WINAPI d3drm3_CreateClippedVisual(IDirect3DRM3 *iface,
static HRESULT WINAPI d3drm3_SetOptions(IDirect3DRM3 *iface, DWORD flags) static HRESULT WINAPI d3drm3_SetOptions(IDirect3DRM3 *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;
} }
......
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/frame.c
View file @ c699803f
...@@ -187,7 +187,7 @@ static ULONG WINAPI d3drm_frame_array_AddRef(IDirect3DRMFrameArray *iface) ...@@ -187,7 +187,7 @@ static ULONG WINAPI d3drm_frame_array_AddRef(IDirect3DRMFrameArray *iface)
struct d3drm_frame_array *array = impl_from_IDirect3DRMFrameArray(iface); struct d3drm_frame_array *array = impl_from_IDirect3DRMFrameArray(iface);
ULONG refcount = InterlockedIncrement(&array->ref); ULONG refcount = InterlockedIncrement(&array->ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -198,7 +198,7 @@ static ULONG WINAPI d3drm_frame_array_Release(IDirect3DRMFrameArray *iface) ...@@ -198,7 +198,7 @@ static ULONG WINAPI d3drm_frame_array_Release(IDirect3DRMFrameArray *iface)
ULONG refcount = InterlockedDecrement(&array->ref); ULONG refcount = InterlockedDecrement(&array->ref);
ULONG i; ULONG i;
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -227,7 +227,7 @@ static HRESULT WINAPI d3drm_frame_array_GetElement(IDirect3DRMFrameArray *iface, ...@@ -227,7 +227,7 @@ static HRESULT WINAPI d3drm_frame_array_GetElement(IDirect3DRMFrameArray *iface,
{ {
struct d3drm_frame_array *array = impl_from_IDirect3DRMFrameArray(iface); struct d3drm_frame_array *array = impl_from_IDirect3DRMFrameArray(iface);
TRACE("iface %p, index %u, frame %p.\n", iface, index, frame); TRACE("iface %p, index %lu, frame %p.\n", iface, index, frame);
if (!frame) if (!frame)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -305,7 +305,7 @@ static ULONG WINAPI d3drm_visual_array_AddRef(IDirect3DRMVisualArray *iface) ...@@ -305,7 +305,7 @@ static ULONG WINAPI d3drm_visual_array_AddRef(IDirect3DRMVisualArray *iface)
struct d3drm_visual_array *array = impl_from_IDirect3DRMVisualArray(iface); struct d3drm_visual_array *array = impl_from_IDirect3DRMVisualArray(iface);
ULONG refcount = InterlockedIncrement(&array->ref); ULONG refcount = InterlockedIncrement(&array->ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -316,7 +316,7 @@ static ULONG WINAPI d3drm_visual_array_Release(IDirect3DRMVisualArray *iface) ...@@ -316,7 +316,7 @@ static ULONG WINAPI d3drm_visual_array_Release(IDirect3DRMVisualArray *iface)
ULONG refcount = InterlockedDecrement(&array->ref); ULONG refcount = InterlockedDecrement(&array->ref);
ULONG i; ULONG i;
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -345,7 +345,7 @@ static HRESULT WINAPI d3drm_visual_array_GetElement(IDirect3DRMVisualArray *ifac ...@@ -345,7 +345,7 @@ static HRESULT WINAPI d3drm_visual_array_GetElement(IDirect3DRMVisualArray *ifac
{ {
struct d3drm_visual_array *array = impl_from_IDirect3DRMVisualArray(iface); struct d3drm_visual_array *array = impl_from_IDirect3DRMVisualArray(iface);
TRACE("iface %p, index %u, visual %p.\n", iface, index, visual); TRACE("iface %p, index %lu, visual %p.\n", iface, index, visual);
if (!visual) if (!visual)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -424,7 +424,7 @@ static ULONG WINAPI d3drm_light_array_AddRef(IDirect3DRMLightArray *iface) ...@@ -424,7 +424,7 @@ static ULONG WINAPI d3drm_light_array_AddRef(IDirect3DRMLightArray *iface)
struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface);
ULONG refcount = InterlockedIncrement(&array->ref); ULONG refcount = InterlockedIncrement(&array->ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -435,7 +435,7 @@ static ULONG WINAPI d3drm_light_array_Release(IDirect3DRMLightArray *iface) ...@@ -435,7 +435,7 @@ static ULONG WINAPI d3drm_light_array_Release(IDirect3DRMLightArray *iface)
ULONG refcount = InterlockedDecrement(&array->ref); ULONG refcount = InterlockedDecrement(&array->ref);
ULONG i; ULONG i;
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -464,7 +464,7 @@ static HRESULT WINAPI d3drm_light_array_GetElement(IDirect3DRMLightArray *iface, ...@@ -464,7 +464,7 @@ static HRESULT WINAPI d3drm_light_array_GetElement(IDirect3DRMLightArray *iface,
{ {
struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface);
TRACE("iface %p, index %u, light %p.\n", iface, index, light); TRACE("iface %p, index %lu, light %p.\n", iface, index, light);
if (!light) if (!light)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -575,7 +575,7 @@ static ULONG WINAPI d3drm_frame3_AddRef(IDirect3DRMFrame3 *iface) ...@@ -575,7 +575,7 @@ static ULONG WINAPI d3drm_frame3_AddRef(IDirect3DRMFrame3 *iface)
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface);
ULONG refcount = InterlockedIncrement(&frame->ref); ULONG refcount = InterlockedIncrement(&frame->ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -604,7 +604,7 @@ static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface) ...@@ -604,7 +604,7 @@ static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface)
ULONG refcount = InterlockedDecrement(&frame->ref); ULONG refcount = InterlockedDecrement(&frame->ref);
ULONG i; ULONG i;
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -737,7 +737,7 @@ static HRESULT WINAPI d3drm_frame3_SetAppData(IDirect3DRMFrame3 *iface, DWORD da ...@@ -737,7 +737,7 @@ static HRESULT WINAPI d3drm_frame3_SetAppData(IDirect3DRMFrame3 *iface, DWORD da
{ {
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
frame->obj.appdata = data; frame->obj.appdata = data;
...@@ -748,7 +748,7 @@ static HRESULT WINAPI d3drm_frame2_SetAppData(IDirect3DRMFrame2 *iface, DWORD da ...@@ -748,7 +748,7 @@ static HRESULT WINAPI d3drm_frame2_SetAppData(IDirect3DRMFrame2 *iface, DWORD da
{ {
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
return d3drm_frame3_SetAppData(&frame->IDirect3DRMFrame3_iface, data); return d3drm_frame3_SetAppData(&frame->IDirect3DRMFrame3_iface, data);
} }
...@@ -757,7 +757,7 @@ static HRESULT WINAPI d3drm_frame1_SetAppData(IDirect3DRMFrame *iface, DWORD dat ...@@ -757,7 +757,7 @@ static HRESULT WINAPI d3drm_frame1_SetAppData(IDirect3DRMFrame *iface, DWORD dat
{ {
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
return d3drm_frame3_SetAppData(&frame->IDirect3DRMFrame3_iface, data); return d3drm_frame3_SetAppData(&frame->IDirect3DRMFrame3_iface, data);
} }
...@@ -984,7 +984,7 @@ static HRESULT WINAPI d3drm_frame1_AddLight(IDirect3DRMFrame *iface, IDirect3DRM ...@@ -984,7 +984,7 @@ static HRESULT WINAPI d3drm_frame1_AddLight(IDirect3DRMFrame *iface, IDirect3DRM
static HRESULT WINAPI d3drm_frame3_AddMoveCallback(IDirect3DRMFrame3 *iface, static HRESULT WINAPI d3drm_frame3_AddMoveCallback(IDirect3DRMFrame3 *iface,
D3DRMFRAME3MOVECALLBACK cb, void *ctx, DWORD flags) D3DRMFRAME3MOVECALLBACK cb, void *ctx, DWORD flags)
{ {
FIXME("iface %p, cb %p, ctx %p flags %#x stub!\n", iface, cb, ctx, flags); FIXME("iface %p, cb %p, ctx %p flags %#lx stub!\n", iface, cb, ctx, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1754,7 +1754,7 @@ static HRESULT WINAPI d3drm_frame1_InverseTransform(IDirect3DRMFrame *iface, D3D ...@@ -1754,7 +1754,7 @@ static HRESULT WINAPI d3drm_frame1_InverseTransform(IDirect3DRMFrame *iface, D3D
static HRESULT WINAPI d3drm_frame3_Load(IDirect3DRMFrame3 *iface, void *filename, static HRESULT WINAPI d3drm_frame3_Load(IDirect3DRMFrame3 *iface, void *filename,
void *name, D3DRMLOADOPTIONS flags, D3DRMLOADTEXTURE3CALLBACK cb, void *ctx) void *name, D3DRMLOADOPTIONS flags, D3DRMLOADTEXTURE3CALLBACK cb, void *ctx)
{ {
FIXME("iface %p, filename %p, name %p, flags %#x, cb %p, ctx %p stub!\n", FIXME("iface %p, filename %p, name %p, flags %#lx, cb %p, ctx %p stub!\n",
iface, filename, name, flags, cb, ctx); iface, filename, name, flags, cb, ctx);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -1763,7 +1763,7 @@ static HRESULT WINAPI d3drm_frame3_Load(IDirect3DRMFrame3 *iface, void *filename ...@@ -1763,7 +1763,7 @@ static HRESULT WINAPI d3drm_frame3_Load(IDirect3DRMFrame3 *iface, void *filename
static HRESULT WINAPI d3drm_frame2_Load(IDirect3DRMFrame2 *iface, void *filename, static HRESULT WINAPI d3drm_frame2_Load(IDirect3DRMFrame2 *iface, void *filename,
void *name, D3DRMLOADOPTIONS flags, D3DRMLOADTEXTURECALLBACK cb, void *ctx) void *name, D3DRMLOADOPTIONS flags, D3DRMLOADTEXTURECALLBACK cb, void *ctx)
{ {
FIXME("iface %p, filename %p, name %p, flags %#x, cb %p, ctx %p stub!\n", FIXME("iface %p, filename %p, name %p, flags %#lx, cb %p, ctx %p stub!\n",
iface, filename, name, flags, cb, ctx); iface, filename, name, flags, cb, ctx);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -1772,7 +1772,7 @@ static HRESULT WINAPI d3drm_frame2_Load(IDirect3DRMFrame2 *iface, void *filename ...@@ -1772,7 +1772,7 @@ static HRESULT WINAPI d3drm_frame2_Load(IDirect3DRMFrame2 *iface, void *filename
static HRESULT WINAPI d3drm_frame1_Load(IDirect3DRMFrame *iface, void *filename, static HRESULT WINAPI d3drm_frame1_Load(IDirect3DRMFrame *iface, void *filename,
void *name, D3DRMLOADOPTIONS flags, D3DRMLOADTEXTURECALLBACK cb, void *ctx) void *name, D3DRMLOADOPTIONS flags, D3DRMLOADTEXTURECALLBACK cb, void *ctx)
{ {
FIXME("iface %p, filename %p, name %p, flags %#x, cb %p, ctx %p stub!\n", FIXME("iface %p, filename %p, name %p, flags %#lx, cb %p, ctx %p stub!\n",
iface, filename, name, flags, cb, ctx); iface, filename, name, flags, cb, ctx);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -2138,7 +2138,7 @@ static HRESULT WINAPI d3drm_frame3_SetSceneBackground(IDirect3DRMFrame3 *iface, ...@@ -2138,7 +2138,7 @@ static HRESULT WINAPI d3drm_frame3_SetSceneBackground(IDirect3DRMFrame3 *iface,
{ {
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface);
TRACE("iface %p, color 0x%08x.\n", iface, color); TRACE("iface %p, color 0x%08lx.\n", iface, color);
frame->scenebackground = color; frame->scenebackground = color;
...@@ -2149,7 +2149,7 @@ static HRESULT WINAPI d3drm_frame2_SetSceneBackground(IDirect3DRMFrame2 *iface, ...@@ -2149,7 +2149,7 @@ static HRESULT WINAPI d3drm_frame2_SetSceneBackground(IDirect3DRMFrame2 *iface,
{ {
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface);
TRACE("iface %p, color 0x%08x.\n", iface, color); TRACE("iface %p, color 0x%08lx.\n", iface, color);
return d3drm_frame3_SetSceneBackground(&frame->IDirect3DRMFrame3_iface, color); return d3drm_frame3_SetSceneBackground(&frame->IDirect3DRMFrame3_iface, color);
} }
...@@ -2158,7 +2158,7 @@ static HRESULT WINAPI d3drm_frame1_SetSceneBackground(IDirect3DRMFrame *iface, D ...@@ -2158,7 +2158,7 @@ static HRESULT WINAPI d3drm_frame1_SetSceneBackground(IDirect3DRMFrame *iface, D
{ {
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface);
TRACE("iface %p, color 0x%08x.\n", iface, color); TRACE("iface %p, color 0x%08lx.\n", iface, color);
return d3drm_frame3_SetSceneBackground(&frame->IDirect3DRMFrame3_iface, color); return d3drm_frame3_SetSceneBackground(&frame->IDirect3DRMFrame3_iface, color);
} }
...@@ -2266,21 +2266,21 @@ static HRESULT WINAPI d3drm_frame1_SetSceneFogEnable(IDirect3DRMFrame *iface, BO ...@@ -2266,21 +2266,21 @@ static HRESULT WINAPI d3drm_frame1_SetSceneFogEnable(IDirect3DRMFrame *iface, BO
static HRESULT WINAPI d3drm_frame3_SetSceneFogColor(IDirect3DRMFrame3 *iface, D3DCOLOR color) static HRESULT WINAPI d3drm_frame3_SetSceneFogColor(IDirect3DRMFrame3 *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;
} }
static HRESULT WINAPI d3drm_frame2_SetSceneFogColor(IDirect3DRMFrame2 *iface, D3DCOLOR color) static HRESULT WINAPI d3drm_frame2_SetSceneFogColor(IDirect3DRMFrame2 *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;
} }
static HRESULT WINAPI d3drm_frame1_SetSceneFogColor(IDirect3DRMFrame *iface, D3DCOLOR color) static HRESULT WINAPI d3drm_frame1_SetSceneFogColor(IDirect3DRMFrame *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;
} }
...@@ -2332,21 +2332,21 @@ static HRESULT WINAPI d3drm_frame1_SetSceneFogParams(IDirect3DRMFrame *iface, ...@@ -2332,21 +2332,21 @@ static HRESULT WINAPI d3drm_frame1_SetSceneFogParams(IDirect3DRMFrame *iface,
static HRESULT WINAPI d3drm_frame3_SetColor(IDirect3DRMFrame3 *iface, D3DCOLOR color) static HRESULT WINAPI d3drm_frame3_SetColor(IDirect3DRMFrame3 *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;
} }
static HRESULT WINAPI d3drm_frame2_SetColor(IDirect3DRMFrame2 *iface, D3DCOLOR color) static HRESULT WINAPI d3drm_frame2_SetColor(IDirect3DRMFrame2 *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;
} }
static HRESULT WINAPI d3drm_frame1_SetColor(IDirect3DRMFrame *iface, D3DCOLOR color) static HRESULT WINAPI d3drm_frame1_SetColor(IDirect3DRMFrame *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;
} }
...@@ -2635,7 +2635,7 @@ static HRESULT WINAPI d3drm_frame1_Transform(IDirect3DRMFrame *iface, D3DVECTOR ...@@ -2635,7 +2635,7 @@ static HRESULT WINAPI d3drm_frame1_Transform(IDirect3DRMFrame *iface, D3DVECTOR
static HRESULT WINAPI d3drm_frame2_AddMoveCallback2(IDirect3DRMFrame2 *iface, static HRESULT WINAPI d3drm_frame2_AddMoveCallback2(IDirect3DRMFrame2 *iface,
D3DRMFRAMEMOVECALLBACK cb, void *ctx, DWORD flags) D3DRMFRAMEMOVECALLBACK cb, void *ctx, DWORD flags)
{ {
FIXME("iface %p, cb %p, ctx %p, flags %#x stub!\n", iface, cb, ctx, flags); FIXME("iface %p, cb %p, ctx %p, flags %#lx stub!\n", iface, cb, ctx, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2772,7 +2772,7 @@ static HRESULT WINAPI d3drm_frame3_SetQuaternion(IDirect3DRMFrame3 *iface, ...@@ -2772,7 +2772,7 @@ static HRESULT WINAPI d3drm_frame3_SetQuaternion(IDirect3DRMFrame3 *iface,
static HRESULT WINAPI d3drm_frame3_RayPick(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, static HRESULT WINAPI d3drm_frame3_RayPick(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference,
D3DRMRAY *ray, DWORD flags, IDirect3DRMPicked2Array **visuals) D3DRMRAY *ray, DWORD flags, IDirect3DRMPicked2Array **visuals)
{ {
FIXME("iface %p, reference %p, ray %p, flags %#x, visuals %p stub!\n", FIXME("iface %p, reference %p, ray %p, flags %#lx, visuals %p stub!\n",
iface, reference, ray, flags, visuals); iface, reference, ray, flags, visuals);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -2781,7 +2781,7 @@ static HRESULT WINAPI d3drm_frame3_RayPick(IDirect3DRMFrame3 *iface, IDirect3DRM ...@@ -2781,7 +2781,7 @@ static HRESULT WINAPI d3drm_frame3_RayPick(IDirect3DRMFrame3 *iface, IDirect3DRM
static HRESULT WINAPI d3drm_frame3_Save(IDirect3DRMFrame3 *iface, static HRESULT WINAPI d3drm_frame3_Save(IDirect3DRMFrame3 *iface,
const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags) const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags)
{ {
FIXME("iface %p, filename %s, format %#x, flags %#x stub!\n", FIXME("iface %p, filename %s, format %#x, flags %#lx stub!\n",
iface, debugstr_a(filename), format, flags); iface, debugstr_a(filename), format, flags);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -2790,7 +2790,7 @@ static HRESULT WINAPI d3drm_frame3_Save(IDirect3DRMFrame3 *iface, ...@@ -2790,7 +2790,7 @@ static HRESULT WINAPI d3drm_frame3_Save(IDirect3DRMFrame3 *iface,
static HRESULT WINAPI d3drm_frame3_TransformVectors(IDirect3DRMFrame3 *iface, static HRESULT WINAPI d3drm_frame3_TransformVectors(IDirect3DRMFrame3 *iface,
IDirect3DRMFrame3 *reference, DWORD num, D3DVECTOR *dst, D3DVECTOR *src) IDirect3DRMFrame3 *reference, DWORD num, D3DVECTOR *dst, D3DVECTOR *src)
{ {
FIXME("iface %p, reference %p, num %u, dst %p, src %p stub!\n", iface, reference, num, dst, src); FIXME("iface %p, reference %p, num %lu, dst %p, src %p stub!\n", iface, reference, num, dst, src);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2798,7 +2798,7 @@ static HRESULT WINAPI d3drm_frame3_TransformVectors(IDirect3DRMFrame3 *iface, ...@@ -2798,7 +2798,7 @@ static HRESULT WINAPI d3drm_frame3_TransformVectors(IDirect3DRMFrame3 *iface,
static HRESULT WINAPI d3drm_frame3_InverseTransformVectors(IDirect3DRMFrame3 *iface, static HRESULT WINAPI d3drm_frame3_InverseTransformVectors(IDirect3DRMFrame3 *iface,
IDirect3DRMFrame3 *reference, DWORD num, D3DVECTOR *dst, D3DVECTOR *src) IDirect3DRMFrame3 *reference, DWORD num, D3DVECTOR *dst, D3DVECTOR *src)
{ {
FIXME("iface %p, reference %p, num %u, dst %p, src %p stub!\n", iface, reference, num, dst, src); FIXME("iface %p, reference %p, num %lu, dst %p, src %p stub!\n", iface, reference, num, dst, src);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2808,7 +2808,7 @@ static HRESULT WINAPI d3drm_frame3_SetTraversalOptions(IDirect3DRMFrame3 *iface, ...@@ -2808,7 +2808,7 @@ static HRESULT WINAPI d3drm_frame3_SetTraversalOptions(IDirect3DRMFrame3 *iface,
static const DWORD supported_options = D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE; static const DWORD supported_options = D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE;
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface);
TRACE("iface %p, options %#x.\n", iface, options); TRACE("iface %p, options %#lx.\n", iface, options);
if (options & ~supported_options) if (options & ~supported_options)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -2834,7 +2834,7 @@ static HRESULT WINAPI d3drm_frame3_GetTraversalOptions(IDirect3DRMFrame3 *iface, ...@@ -2834,7 +2834,7 @@ static HRESULT WINAPI d3drm_frame3_GetTraversalOptions(IDirect3DRMFrame3 *iface,
static HRESULT WINAPI d3drm_frame3_SetSceneFogMethod(IDirect3DRMFrame3 *iface, DWORD flags) static HRESULT WINAPI d3drm_frame3_SetSceneFogMethod(IDirect3DRMFrame3 *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;
} }
...@@ -3210,7 +3210,7 @@ static ULONG WINAPI d3drm_animation2_AddRef(IDirect3DRMAnimation2 *iface) ...@@ -3210,7 +3210,7 @@ static ULONG WINAPI d3drm_animation2_AddRef(IDirect3DRMAnimation2 *iface)
struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface);
ULONG refcount = InterlockedIncrement(&animation->ref); ULONG refcount = InterlockedIncrement(&animation->ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -3226,7 +3226,7 @@ static ULONG WINAPI d3drm_animation2_Release(IDirect3DRMAnimation2 *iface) ...@@ -3226,7 +3226,7 @@ static ULONG WINAPI d3drm_animation2_Release(IDirect3DRMAnimation2 *iface)
struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface);
ULONG refcount = InterlockedDecrement(&animation->ref); ULONG refcount = InterlockedDecrement(&animation->ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -3306,7 +3306,7 @@ static HRESULT WINAPI d3drm_animation2_SetAppData(IDirect3DRMAnimation2 *iface, ...@@ -3306,7 +3306,7 @@ static HRESULT WINAPI d3drm_animation2_SetAppData(IDirect3DRMAnimation2 *iface,
{ {
struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
animation->obj.appdata = data; animation->obj.appdata = data;
...@@ -3317,7 +3317,7 @@ static HRESULT WINAPI d3drm_animation1_SetAppData(IDirect3DRMAnimation *iface, D ...@@ -3317,7 +3317,7 @@ static HRESULT WINAPI d3drm_animation1_SetAppData(IDirect3DRMAnimation *iface, D
{ {
struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
return d3drm_animation2_SetAppData(&animation->IDirect3DRMAnimation2_iface, data); return d3drm_animation2_SetAppData(&animation->IDirect3DRMAnimation2_iface, data);
} }
...@@ -3400,7 +3400,7 @@ static HRESULT WINAPI d3drm_animation2_SetOptions(IDirect3DRMAnimation2 *iface, ...@@ -3400,7 +3400,7 @@ static HRESULT WINAPI d3drm_animation2_SetOptions(IDirect3DRMAnimation2 *iface,
static const DWORD supported_options = D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION static const DWORD supported_options = D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION
| D3DRMANIMATION_SPLINEPOSITION | D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION; | D3DRMANIMATION_SPLINEPOSITION | D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION;
TRACE("iface %p, options %#x.\n", iface, options); TRACE("iface %p, options %#lx.\n", iface, options);
if (!(options & supported_options)) if (!(options & supported_options))
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -3423,7 +3423,7 @@ static HRESULT WINAPI d3drm_animation1_SetOptions(IDirect3DRMAnimation *iface, D ...@@ -3423,7 +3423,7 @@ static HRESULT WINAPI d3drm_animation1_SetOptions(IDirect3DRMAnimation *iface, D
{ {
struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface);
TRACE("iface %p, %#x.\n", iface, options); TRACE("iface %p, %#lx.\n", iface, options);
return d3drm_animation2_SetOptions(&animation->IDirect3DRMAnimation2_iface, options); return d3drm_animation2_SetOptions(&animation->IDirect3DRMAnimation2_iface, options);
} }
...@@ -3746,7 +3746,7 @@ static HRESULT WINAPI d3drm_animation2_GetFrame(IDirect3DRMAnimation2 *iface, ID ...@@ -3746,7 +3746,7 @@ static HRESULT WINAPI d3drm_animation2_GetFrame(IDirect3DRMAnimation2 *iface, ID
static HRESULT WINAPI d3drm_animation2_DeleteKeyByID(IDirect3DRMAnimation2 *iface, DWORD id) static HRESULT WINAPI d3drm_animation2_DeleteKeyByID(IDirect3DRMAnimation2 *iface, DWORD id)
{ {
FIXME("iface %p, id %#x.\n", iface, id); FIXME("iface %p, id %#lx.\n", iface, id);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
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/meshbuilder.c
View file @ c699803f
...@@ -372,7 +372,7 @@ static ULONG WINAPI d3drm_mesh_builder2_AddRef(IDirect3DRMMeshBuilder2 *iface) ...@@ -372,7 +372,7 @@ static ULONG WINAPI d3drm_mesh_builder2_AddRef(IDirect3DRMMeshBuilder2 *iface)
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface);
ULONG refcount = InterlockedIncrement(&mesh_builder->ref); ULONG refcount = InterlockedIncrement(&mesh_builder->ref);
TRACE("%p increasing refcount to %u.\n", mesh_builder, refcount); TRACE("%p increasing refcount to %lu.\n", mesh_builder, refcount);
return refcount; return refcount;
} }
...@@ -382,7 +382,7 @@ static ULONG WINAPI d3drm_mesh_builder2_Release(IDirect3DRMMeshBuilder2 *iface) ...@@ -382,7 +382,7 @@ static ULONG WINAPI d3drm_mesh_builder2_Release(IDirect3DRMMeshBuilder2 *iface)
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface);
ULONG refcount = InterlockedDecrement(&mesh_builder->ref); ULONG refcount = InterlockedDecrement(&mesh_builder->ref);
TRACE("%p decreasing refcount to %u.\n", mesh_builder, refcount); TRACE("%p decreasing refcount to %lu.\n", mesh_builder, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -431,7 +431,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetAppData(IDirect3DRMMeshBuilder3 *if ...@@ -431,7 +431,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetAppData(IDirect3DRMMeshBuilder3 *if
{ {
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
mesh_builder->obj.appdata = data; mesh_builder->obj.appdata = data;
...@@ -442,7 +442,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetAppData(IDirect3DRMMeshBuilder2 *if ...@@ -442,7 +442,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetAppData(IDirect3DRMMeshBuilder2 *if
{ {
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
return d3drm_mesh_builder3_SetAppData(&mesh_builder->IDirect3DRMMeshBuilder3_iface, data); return d3drm_mesh_builder3_SetAppData(&mesh_builder->IDirect3DRMMeshBuilder3_iface, data);
} }
...@@ -497,7 +497,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_Load(IDirect3DRMMeshBuilder2 *iface, v ...@@ -497,7 +497,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_Load(IDirect3DRMMeshBuilder2 *iface, v
{ {
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface);
TRACE("iface %p, filename %p, name %p, flags %#x, cb %p, ctx %p.\n", TRACE("iface %p, filename %p, name %p, flags %#lx, cb %p, ctx %p.\n",
iface, filename, name, flags, cb, ctx); iface, filename, name, flags, cb, ctx);
if (cb) if (cb)
...@@ -510,7 +510,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_Load(IDirect3DRMMeshBuilder2 *iface, v ...@@ -510,7 +510,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_Load(IDirect3DRMMeshBuilder2 *iface, v
static HRESULT WINAPI d3drm_mesh_builder2_Save(IDirect3DRMMeshBuilder2 *iface, static HRESULT WINAPI d3drm_mesh_builder2_Save(IDirect3DRMMeshBuilder2 *iface,
const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags) const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags)
{ {
FIXME("iface %p, filename %s, format %#x, flags %#x stub!\n", FIXME("iface %p, filename %s, format %#x, flags %#lx stub!\n",
iface, debugstr_a(filename), format, flags); iface, debugstr_a(filename), format, flags);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -595,7 +595,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_AddFaces(IDirect3DRMMeshBuilder2 *ifac ...@@ -595,7 +595,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_AddFaces(IDirect3DRMMeshBuilder2 *ifac
DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, D3DVECTOR *normals, DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, D3DVECTOR *normals,
DWORD *face_data, IDirect3DRMFaceArray **array) DWORD *face_data, IDirect3DRMFaceArray **array)
{ {
FIXME("iface %p, vertex_count %u, vertices %p, normal_count %u, normals %p, face_data %p, array %p stub!\n", FIXME("iface %p, vertex_count %lu, vertices %p, normal_count %lu, normals %p, face_data %p, array %p stub!\n",
iface, vertex_count, vertices, normal_count, normals, face_data, array); iface, vertex_count, vertices, normal_count, normals, face_data, array);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -604,7 +604,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_AddFaces(IDirect3DRMMeshBuilder2 *ifac ...@@ -604,7 +604,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_AddFaces(IDirect3DRMMeshBuilder2 *ifac
static HRESULT WINAPI d3drm_mesh_builder2_ReserveSpace(IDirect3DRMMeshBuilder2 *iface, static HRESULT WINAPI d3drm_mesh_builder2_ReserveSpace(IDirect3DRMMeshBuilder2 *iface,
DWORD vertex_count, DWORD normal_count, DWORD face_count) DWORD vertex_count, DWORD normal_count, DWORD face_count)
{ {
FIXME("iface %p, vertex_count %u, normal_count %u, face_count %u stub!\n", FIXME("iface %p, vertex_count %lu, normal_count %lu, face_count %lu stub!\n",
iface, vertex_count, normal_count, face_count); iface, vertex_count, normal_count, face_count);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -624,7 +624,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetColor(IDirect3DRMMeshBuilder2 *ifac ...@@ -624,7 +624,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetColor(IDirect3DRMMeshBuilder2 *ifac
{ {
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface);
TRACE("iface %p, color 0x%08x.\n", iface, color); TRACE("iface %p, color 0x%08lx.\n", iface, color);
return IDirect3DRMMeshBuilder3_SetColor(&mesh_builder->IDirect3DRMMeshBuilder3_iface, color); return IDirect3DRMMeshBuilder3_SetColor(&mesh_builder->IDirect3DRMMeshBuilder3_iface, color);
} }
...@@ -670,7 +670,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetTextureTopology(IDirect3DRMMeshBuil ...@@ -670,7 +670,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetTextureTopology(IDirect3DRMMeshBuil
static HRESULT WINAPI d3drm_mesh_builder2_SetQuality(IDirect3DRMMeshBuilder2 *iface, static HRESULT WINAPI d3drm_mesh_builder2_SetQuality(IDirect3DRMMeshBuilder2 *iface,
D3DRMRENDERQUALITY quality) D3DRMRENDERQUALITY quality)
{ {
FIXME("iface %p, quality %#x stub!\n", iface, quality); FIXME("iface %p, quality %#lx stub!\n", iface, quality);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -685,7 +685,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetPerspective(IDirect3DRMMeshBuilder2 ...@@ -685,7 +685,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetPerspective(IDirect3DRMMeshBuilder2
static HRESULT WINAPI d3drm_mesh_builder2_SetVertex(IDirect3DRMMeshBuilder2 *iface, static HRESULT WINAPI d3drm_mesh_builder2_SetVertex(IDirect3DRMMeshBuilder2 *iface,
DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z) DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z)
{ {
FIXME("iface %p, index %u, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); FIXME("iface %p, index %lu, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -693,7 +693,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetVertex(IDirect3DRMMeshBuilder2 *ifa ...@@ -693,7 +693,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetVertex(IDirect3DRMMeshBuilder2 *ifa
static HRESULT WINAPI d3drm_mesh_builder2_SetNormal(IDirect3DRMMeshBuilder2 *iface, static HRESULT WINAPI d3drm_mesh_builder2_SetNormal(IDirect3DRMMeshBuilder2 *iface,
DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z) DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z)
{ {
FIXME("iface %p, index %u, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); FIXME("iface %p, index %lu, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -703,7 +703,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetTextureCoordinates(IDirect3DRMMeshB ...@@ -703,7 +703,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetTextureCoordinates(IDirect3DRMMeshB
{ {
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface);
TRACE("iface %p, index %u, u %.8e, v %.8e.\n", iface, index, u, v); TRACE("iface %p, index %lu, u %.8e, v %.8e.\n", iface, index, u, v);
return IDirect3DRMMeshBuilder3_SetTextureCoordinates(&mesh_builder->IDirect3DRMMeshBuilder3_iface, return IDirect3DRMMeshBuilder3_SetTextureCoordinates(&mesh_builder->IDirect3DRMMeshBuilder3_iface,
index, u, v); index, u, v);
...@@ -712,7 +712,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetTextureCoordinates(IDirect3DRMMeshB ...@@ -712,7 +712,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetTextureCoordinates(IDirect3DRMMeshB
static HRESULT WINAPI d3drm_mesh_builder2_SetVertexColor(IDirect3DRMMeshBuilder2 *iface, static HRESULT WINAPI d3drm_mesh_builder2_SetVertexColor(IDirect3DRMMeshBuilder2 *iface,
DWORD index, D3DCOLOR color) DWORD index, D3DCOLOR color)
{ {
FIXME("iface %p, index %u, color 0x%08x stub!\n", iface, index, color); FIXME("iface %p, index %lu, color 0x%08lx stub!\n", iface, index, color);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -720,7 +720,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetVertexColor(IDirect3DRMMeshBuilder2 ...@@ -720,7 +720,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetVertexColor(IDirect3DRMMeshBuilder2
static HRESULT WINAPI d3drm_mesh_builder2_SetVertexColorRGB(IDirect3DRMMeshBuilder2 *iface, static HRESULT WINAPI d3drm_mesh_builder2_SetVertexColorRGB(IDirect3DRMMeshBuilder2 *iface,
DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue)
{ {
FIXME("iface %p, index %u, red %.8e, green %.8e, blue %.8e stub!\n", FIXME("iface %p, index %lu, red %.8e, green %.8e, blue %.8e stub!\n",
iface, index, red, green, blue); iface, index, red, green, blue);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -772,7 +772,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GetTextureCoordinates(IDirect3DRMMeshB ...@@ -772,7 +772,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GetTextureCoordinates(IDirect3DRMMeshB
{ {
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface);
TRACE("iface %p, index %u, u %p, v %p.\n", iface, index, u, v); TRACE("iface %p, index %lu, u %p, v %p.\n", iface, index, u, v);
return IDirect3DRMMeshBuilder3_GetTextureCoordinates(&mesh_builder->IDirect3DRMMeshBuilder3_iface, return IDirect3DRMMeshBuilder3_GetTextureCoordinates(&mesh_builder->IDirect3DRMMeshBuilder3_iface,
index, u, v); index, u, v);
...@@ -847,7 +847,7 @@ static int WINAPI d3drm_mesh_builder2_GetVertexCount(IDirect3DRMMeshBuilder2 *if ...@@ -847,7 +847,7 @@ static int WINAPI d3drm_mesh_builder2_GetVertexCount(IDirect3DRMMeshBuilder2 *if
static D3DCOLOR WINAPI d3drm_mesh_builder2_GetVertexColor(IDirect3DRMMeshBuilder2 *iface, DWORD index) static D3DCOLOR WINAPI d3drm_mesh_builder2_GetVertexColor(IDirect3DRMMeshBuilder2 *iface, DWORD index)
{ {
FIXME("iface %p, index %u stub!\n", iface, index); FIXME("iface %p, index %lu stub!\n", iface, index);
return 0; return 0;
} }
...@@ -864,7 +864,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_CreateMesh(IDirect3DRMMeshBuilder2 *if ...@@ -864,7 +864,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_CreateMesh(IDirect3DRMMeshBuilder2 *if
static HRESULT WINAPI d3drm_mesh_builder2_GenerateNormals2(IDirect3DRMMeshBuilder2 *iface, static HRESULT WINAPI d3drm_mesh_builder2_GenerateNormals2(IDirect3DRMMeshBuilder2 *iface,
D3DVALUE crease, DWORD flags) D3DVALUE crease, DWORD flags)
{ {
FIXME("iface %p, crease %.8e, flags %#x stub!\n", iface, crease, flags); FIXME("iface %p, crease %.8e, flags %#lx stub!\n", iface, crease, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -872,7 +872,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GenerateNormals2(IDirect3DRMMeshBuilde ...@@ -872,7 +872,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GenerateNormals2(IDirect3DRMMeshBuilde
static HRESULT WINAPI d3drm_mesh_builder2_GetFace(IDirect3DRMMeshBuilder2 *iface, static HRESULT WINAPI d3drm_mesh_builder2_GetFace(IDirect3DRMMeshBuilder2 *iface,
DWORD index, IDirect3DRMFace **face) DWORD index, IDirect3DRMFace **face)
{ {
FIXME("iface %p, index %u, face %p stub!\n", iface, index, face); FIXME("iface %p, index %lu, face %p stub!\n", iface, index, face);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1066,7 +1066,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, ...@@ -1066,7 +1066,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData,
mesh_builder->nb_faces = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_vertices * sizeof(D3DVECTOR)); mesh_builder->nb_faces = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_vertices * sizeof(D3DVECTOR));
faces_vertex_idx_size = size - sizeof(DWORD) - mesh_builder->nb_vertices * sizeof(D3DVECTOR) - sizeof(DWORD); faces_vertex_idx_size = size - sizeof(DWORD) - mesh_builder->nb_vertices * sizeof(D3DVECTOR) - sizeof(DWORD);
TRACE("Mesh: nb_vertices = %lu, nb_faces = %d, faces_vertex_idx_size = %d\n", mesh_builder->nb_vertices, TRACE("Mesh: nb_vertices = %Iu, nb_faces = %ld, faces_vertex_idx_size = %ld\n", mesh_builder->nb_vertices,
mesh_builder->nb_faces, faces_vertex_idx_size); mesh_builder->nb_faces, faces_vertex_idx_size);
if (!d3drm_array_reserve((void **)&mesh_builder->vertices, &mesh_builder->vertices_size, mesh_builder->nb_vertices, if (!d3drm_array_reserve((void **)&mesh_builder->vertices, &mesh_builder->vertices_size, mesh_builder->nb_vertices,
...@@ -1121,9 +1121,9 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, ...@@ -1121,9 +1121,9 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData,
mesh_builder->nb_normals = *(DWORD*)ptr; mesh_builder->nb_normals = *(DWORD*)ptr;
nb_faces_normals = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR)); nb_faces_normals = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR));
TRACE("MeshNormals: nb_normals = %lu, nb_faces_normals = %d\n", mesh_builder->nb_normals, nb_faces_normals); TRACE("MeshNormals: nb_normals = %Iu, nb_faces_normals = %ld\n", mesh_builder->nb_normals, nb_faces_normals);
if (nb_faces_normals != mesh_builder->nb_faces) if (nb_faces_normals != mesh_builder->nb_faces)
WARN("nb_face_normals (%d) != nb_faces (%d)\n", nb_faces_normals, mesh_builder->nb_faces); WARN("nb_face_normals (%ld) != nb_faces (%ld)\n", nb_faces_normals, mesh_builder->nb_faces);
if (!d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size, if (!d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size,
mesh_builder->nb_normals, sizeof(*mesh_builder->normals))) mesh_builder->nb_normals, sizeof(*mesh_builder->normals)))
...@@ -1146,7 +1146,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, ...@@ -1146,7 +1146,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData,
mesh_builder->nb_coords2d = *(DWORD*)ptr; mesh_builder->nb_coords2d = *(DWORD*)ptr;
TRACE("MeshTextureCoords: nb_coords2d = %d\n", mesh_builder->nb_coords2d); TRACE("MeshTextureCoords: nb_coords2d = %ld\n", mesh_builder->nb_coords2d);
mesh_builder->pCoords2d = heap_calloc(mesh_builder->nb_coords2d, sizeof(*mesh_builder->pCoords2d)); mesh_builder->pCoords2d = heap_calloc(mesh_builder->nb_coords2d, sizeof(*mesh_builder->pCoords2d));
memcpy(mesh_builder->pCoords2d, ptr + sizeof(DWORD), mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d)); memcpy(mesh_builder->pCoords2d, ptr + sizeof(DWORD), mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d));
...@@ -1171,10 +1171,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, ...@@ -1171,10 +1171,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData,
nb_face_indices = *(DWORD*)(ptr + sizeof(DWORD)); nb_face_indices = *(DWORD*)(ptr + sizeof(DWORD));
data_size = 2 * sizeof(DWORD) + nb_face_indices * sizeof(DWORD); data_size = 2 * sizeof(DWORD) + nb_face_indices * sizeof(DWORD);
TRACE("nMaterials = %u, nFaceIndexes = %u\n", nb_materials, nb_face_indices); TRACE("nMaterials = %lu, nFaceIndexes = %lu\n", nb_materials, nb_face_indices);
if (size != data_size) if (size != data_size)
WARN("Returned size %u does not match expected one %u\n", size, data_size); WARN("Returned size %lu does not match expected one %lu\n", size, data_size);
if (!(mesh_builder->material_indices = heap_calloc(nb_face_indices, if (!(mesh_builder->material_indices = heap_calloc(nb_face_indices,
sizeof(*mesh_builder->material_indices)))) sizeof(*mesh_builder->material_indices))))
...@@ -1230,7 +1230,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, ...@@ -1230,7 +1230,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData,
} }
if (size != 44) if (size != 44)
WARN("Material size %u does not match expected one %u\n", size, 44); WARN("Material size %lu does not match expected one %u\n", size, 44);
values = (float*)ptr; values = (float*)ptr;
...@@ -1355,7 +1355,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, ...@@ -1355,7 +1355,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData,
D3DVECTOR face_normal; D3DVECTOR face_normal;
if (faces_vertex_idx_size < sizeof(DWORD)) if (faces_vertex_idx_size < sizeof(DWORD))
WARN("Not enough data to read number of indices of face %d\n", i); WARN("Not enough data to read number of indices of face %ld\n", i);
nb_face_indexes = *(faces_data_ptr + faces_data_size++) = *(faces_vertex_idx_ptr++); nb_face_indexes = *(faces_data_ptr + faces_data_size++) = *(faces_vertex_idx_ptr++);
faces_vertex_idx_size--; faces_vertex_idx_size--;
...@@ -1363,7 +1363,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, ...@@ -1363,7 +1363,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData,
WARN("Faces indices number mismatch\n"); WARN("Faces indices number mismatch\n");
if (faces_vertex_idx_size < (nb_face_indexes * sizeof(DWORD))) if (faces_vertex_idx_size < (nb_face_indexes * sizeof(DWORD)))
WARN("Not enough data to read all indices of face %d\n", i); WARN("Not enough data to read all indices of face %ld\n", i);
if (!mesh_builder->nb_normals) if (!mesh_builder->nb_normals)
{ {
...@@ -1403,7 +1403,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, ...@@ -1403,7 +1403,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData,
DWORD vertex_idx = *faces_vertex_idx_ptr; DWORD vertex_idx = *faces_vertex_idx_ptr;
if (vertex_idx >= mesh_builder->nb_vertices) if (vertex_idx >= mesh_builder->nb_vertices)
{ {
WARN("Found vertex index %u but only %lu vertices available => use index 0\n", vertex_idx, WARN("Found vertex index %lu but only %Iu vertices available => use index 0\n", vertex_idx,
mesh_builder->nb_vertices); mesh_builder->nb_vertices);
vertex_idx = 0; vertex_idx = 0;
} }
...@@ -1470,7 +1470,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v ...@@ -1470,7 +1470,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v
HRESULT hr; HRESULT hr;
HRESULT ret = D3DRMERR_BADOBJECT; HRESULT ret = D3DRMERR_BADOBJECT;
TRACE("iface %p, filename %p, name %p, loadflags %#x, cb %p, arg %p.\n", TRACE("iface %p, filename %p, name %p, loadflags %#lx, cb %p, arg %p.\n",
iface, filename, name, loadflags, cb, arg); iface, filename, name, loadflags, cb, arg);
clean_mesh_builder_data(mesh_builder); clean_mesh_builder_data(mesh_builder);
...@@ -1486,7 +1486,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v ...@@ -1486,7 +1486,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v
} }
else else
{ {
FIXME("Load options %d not supported yet\n", loadflags); FIXME("Load options %ld not supported yet\n", loadflags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1522,7 +1522,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v ...@@ -1522,7 +1522,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v
if ((hr != DXFILE_OK) || (size != sizeof(*header))) if ((hr != DXFILE_OK) || (size != sizeof(*header)))
goto end; goto end;
TRACE("Version is %u.%u, flags %#x.\n", header->major, header->minor, header->flags); TRACE("Version is %u.%u, flags %#lx.\n", header->major, header->minor, header->flags);
/* Version must be 1.0.x */ /* Version must be 1.0.x */
if ((header->major != 1) || (header->minor != 0)) if ((header->major != 1) || (header->minor != 0))
...@@ -1576,7 +1576,7 @@ end: ...@@ -1576,7 +1576,7 @@ end:
static HRESULT WINAPI d3drm_mesh_builder3_Save(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_Save(IDirect3DRMMeshBuilder3 *iface,
const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags) const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags)
{ {
FIXME("iface %p, filename %s, format %#x, flags %#x stub!\n", FIXME("iface %p, filename %s, format %#x, flags %#lx stub!\n",
iface, debugstr_a(filename), format, flags); iface, debugstr_a(filename), format, flags);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -1628,7 +1628,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetBox(IDirect3DRMMeshBuilder3 *iface, ...@@ -1628,7 +1628,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetBox(IDirect3DRMMeshBuilder3 *iface,
static HRESULT WINAPI d3drm_mesh_builder3_GenerateNormals(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_GenerateNormals(IDirect3DRMMeshBuilder3 *iface,
D3DVALUE crease, DWORD flags) D3DVALUE crease, DWORD flags)
{ {
FIXME("iface %p, crease %.8e, flags %#x stub!\n", iface, crease, flags); FIXME("iface %p, crease %.8e, flags %#lx stub!\n", iface, crease, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1650,7 +1650,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddMesh(IDirect3DRMMeshBuilder3 *iface ...@@ -1650,7 +1650,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddMesh(IDirect3DRMMeshBuilder3 *iface
static HRESULT WINAPI d3drm_mesh_builder3_AddMeshBuilder(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_AddMeshBuilder(IDirect3DRMMeshBuilder3 *iface,
IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags)
{ {
FIXME("iface %p, mesh_builder %p, flags %#x stub!\n", iface, mesh_builder, flags); FIXME("iface %p, mesh_builder %p, flags %#lx stub!\n", iface, mesh_builder, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1673,7 +1673,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddFaces(IDirect3DRMMeshBuilder3 *ifac ...@@ -1673,7 +1673,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddFaces(IDirect3DRMMeshBuilder3 *ifac
DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, D3DVECTOR *normals, DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, D3DVECTOR *normals,
DWORD *face_data, IDirect3DRMFaceArray **array) DWORD *face_data, IDirect3DRMFaceArray **array)
{ {
FIXME("iface %p, vertex_count %u, vertices %p, normal_count %u, normals %p, face_data %p array %p stub!\n", FIXME("iface %p, vertex_count %lu, vertices %p, normal_count %lu, normals %p, face_data %p array %p stub!\n",
iface, vertex_count, vertices, normal_count, normals, face_data, array); iface, vertex_count, vertices, normal_count, normals, face_data, array);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -1682,7 +1682,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddFaces(IDirect3DRMMeshBuilder3 *ifac ...@@ -1682,7 +1682,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddFaces(IDirect3DRMMeshBuilder3 *ifac
static HRESULT WINAPI d3drm_mesh_builder3_ReserveSpace(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_ReserveSpace(IDirect3DRMMeshBuilder3 *iface,
DWORD vertex_count, DWORD normal_count, DWORD face_count) DWORD vertex_count, DWORD normal_count, DWORD face_count)
{ {
FIXME("iface %p, vertex_count %u, normal_count %u, face_count %u stub!\n", FIXME("iface %p, vertex_count %lu, normal_count %lu, face_count %lu stub!\n",
iface, vertex_count, normal_count, face_count); iface, vertex_count, normal_count, face_count);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -1704,7 +1704,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetColor(IDirect3DRMMeshBuilder3 *ifac ...@@ -1704,7 +1704,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetColor(IDirect3DRMMeshBuilder3 *ifac
{ {
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface);
TRACE("iface %p, color 0x%08x.\n", iface, color); TRACE("iface %p, color 0x%08lx.\n", iface, color);
mesh_builder->color = color; mesh_builder->color = color;
...@@ -1754,7 +1754,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetTextureTopology(IDirect3DRMMeshBuil ...@@ -1754,7 +1754,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetTextureTopology(IDirect3DRMMeshBuil
static HRESULT WINAPI d3drm_mesh_builder3_SetQuality(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_SetQuality(IDirect3DRMMeshBuilder3 *iface,
D3DRMRENDERQUALITY quality) D3DRMRENDERQUALITY quality)
{ {
FIXME("iface %p, quality %#x stub!\n", iface, quality); FIXME("iface %p, quality %#lx stub!\n", iface, quality);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1770,7 +1770,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetPerspective(IDirect3DRMMeshBuilder3 ...@@ -1770,7 +1770,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetPerspective(IDirect3DRMMeshBuilder3
static HRESULT WINAPI d3drm_mesh_builder3_SetVertex(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_SetVertex(IDirect3DRMMeshBuilder3 *iface,
DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z) DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z)
{ {
FIXME("iface %p, index %u, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); FIXME("iface %p, index %lu, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1778,7 +1778,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetVertex(IDirect3DRMMeshBuilder3 *ifa ...@@ -1778,7 +1778,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetVertex(IDirect3DRMMeshBuilder3 *ifa
static HRESULT WINAPI d3drm_mesh_builder3_SetNormal(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_SetNormal(IDirect3DRMMeshBuilder3 *iface,
DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z) DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z)
{ {
FIXME("iface %p, index %u, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z); FIXME("iface %p, index %lu, x %.8e, y %.8e, z %.8e stub!\n", iface, index, x, y, z);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1788,7 +1788,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetTextureCoordinates(IDirect3DRMMeshB ...@@ -1788,7 +1788,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetTextureCoordinates(IDirect3DRMMeshB
{ {
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface);
TRACE("iface %p, index %u, u %.8e, v %.8e.\n", iface, index, u, v); TRACE("iface %p, index %lu, u %.8e, v %.8e.\n", iface, index, u, v);
if (index >= mesh_builder->nb_coords2d) if (index >= mesh_builder->nb_coords2d)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -1802,7 +1802,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetTextureCoordinates(IDirect3DRMMeshB ...@@ -1802,7 +1802,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetTextureCoordinates(IDirect3DRMMeshB
static HRESULT WINAPI d3drm_mesh_builder3_SetVertexColor(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_SetVertexColor(IDirect3DRMMeshBuilder3 *iface,
DWORD index, D3DCOLOR color) DWORD index, D3DCOLOR color)
{ {
FIXME("iface %p, index %u, color 0x%08x stub!\n", iface, index, color); FIXME("iface %p, index %lu, color 0x%08lx stub!\n", iface, index, color);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1810,7 +1810,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetVertexColor(IDirect3DRMMeshBuilder3 ...@@ -1810,7 +1810,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetVertexColor(IDirect3DRMMeshBuilder3
static HRESULT WINAPI d3drm_mesh_builder3_SetVertexColorRGB(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_SetVertexColorRGB(IDirect3DRMMeshBuilder3 *iface,
DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue)
{ {
FIXME("iface %p, index %u, red %.8e, green %.8e, blue %.8e stub!\n", FIXME("iface %p, index %lu, red %.8e, green %.8e, blue %.8e stub!\n",
iface, index, red, green, blue); iface, index, red, green, blue);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -1840,7 +1840,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetTextureCoordinates(IDirect3DRMMeshB ...@@ -1840,7 +1840,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetTextureCoordinates(IDirect3DRMMeshB
{ {
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface);
TRACE("iface %p, index %u, u %p, v %p.\n", iface, index, u, v); TRACE("iface %p, index %lu, u %p, v %p.\n", iface, index, u, v);
if (index >= mesh_builder->nb_coords2d) if (index >= mesh_builder->nb_coords2d)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -1937,7 +1937,7 @@ static int WINAPI d3drm_mesh_builder3_GetVertexCount(IDirect3DRMMeshBuilder3 *if ...@@ -1937,7 +1937,7 @@ static int WINAPI d3drm_mesh_builder3_GetVertexCount(IDirect3DRMMeshBuilder3 *if
static D3DCOLOR WINAPI d3drm_mesh_builder3_GetVertexColor(IDirect3DRMMeshBuilder3 *iface, static D3DCOLOR WINAPI d3drm_mesh_builder3_GetVertexColor(IDirect3DRMMeshBuilder3 *iface,
DWORD index) DWORD index)
{ {
FIXME("iface %p, index %u stub!\n", iface, index); FIXME("iface %p, index %lu stub!\n", iface, index);
return 0; return 0;
} }
...@@ -2077,7 +2077,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if ...@@ -2077,7 +2077,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if
static HRESULT WINAPI d3drm_mesh_builder3_GetFace(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_GetFace(IDirect3DRMMeshBuilder3 *iface,
DWORD index, IDirect3DRMFace2 **face) DWORD index, IDirect3DRMFace2 **face)
{ {
FIXME("iface %p, index %u, face %p stub!\n", iface, index, face); FIXME("iface %p, index %lu, face %p stub!\n", iface, index, face);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2085,7 +2085,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetFace(IDirect3DRMMeshBuilder3 *iface ...@@ -2085,7 +2085,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetFace(IDirect3DRMMeshBuilder3 *iface
static HRESULT WINAPI d3drm_mesh_builder3_GetVertex(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_GetVertex(IDirect3DRMMeshBuilder3 *iface,
DWORD index, D3DVECTOR *vector) DWORD index, D3DVECTOR *vector)
{ {
FIXME("iface %p, index %u, vector %p stub!\n", iface, index, vector); FIXME("iface %p, index %lu, vector %p stub!\n", iface, index, vector);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2093,7 +2093,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertex(IDirect3DRMMeshBuilder3 *ifa ...@@ -2093,7 +2093,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertex(IDirect3DRMMeshBuilder3 *ifa
static HRESULT WINAPI d3drm_mesh_builder3_GetNormal(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_GetNormal(IDirect3DRMMeshBuilder3 *iface,
DWORD index, D3DVECTOR *vector) DWORD index, D3DVECTOR *vector)
{ {
FIXME("iface %p, index %u, vector %p stub!\n", iface, index, vector); FIXME("iface %p, index %lu, vector %p stub!\n", iface, index, vector);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2101,7 +2101,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetNormal(IDirect3DRMMeshBuilder3 *ifa ...@@ -2101,7 +2101,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetNormal(IDirect3DRMMeshBuilder3 *ifa
static HRESULT WINAPI d3drm_mesh_builder3_DeleteVertices(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_DeleteVertices(IDirect3DRMMeshBuilder3 *iface,
DWORD start_idx, DWORD count) DWORD start_idx, DWORD count)
{ {
FIXME("iface %p, start_idx %u, count %u stub!\n", iface, start_idx, count); FIXME("iface %p, start_idx %lu, count %lu stub!\n", iface, start_idx, count);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2109,7 +2109,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_DeleteVertices(IDirect3DRMMeshBuilder3 ...@@ -2109,7 +2109,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_DeleteVertices(IDirect3DRMMeshBuilder3
static HRESULT WINAPI d3drm_mesh_builder3_DeleteNormals(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_DeleteNormals(IDirect3DRMMeshBuilder3 *iface,
DWORD start_idx, DWORD count) DWORD start_idx, DWORD count)
{ {
FIXME("iface %p, start_idx %u, count %u stub!\n", iface, start_idx, count); FIXME("iface %p, start_idx %lu, count %lu stub!\n", iface, start_idx, count);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2123,14 +2123,14 @@ static HRESULT WINAPI d3drm_mesh_builder3_DeleteFace(IDirect3DRMMeshBuilder3 *if ...@@ -2123,14 +2123,14 @@ static HRESULT WINAPI d3drm_mesh_builder3_DeleteFace(IDirect3DRMMeshBuilder3 *if
static HRESULT WINAPI d3drm_mesh_builder3_Empty(IDirect3DRMMeshBuilder3 *iface, DWORD flags) static HRESULT WINAPI d3drm_mesh_builder3_Empty(IDirect3DRMMeshBuilder3 *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;
} }
static HRESULT WINAPI d3drm_mesh_builder3_Optimize(IDirect3DRMMeshBuilder3 *iface, DWORD flags) static HRESULT WINAPI d3drm_mesh_builder3_Optimize(IDirect3DRMMeshBuilder3 *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;
} }
...@@ -2138,7 +2138,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Optimize(IDirect3DRMMeshBuilder3 *ifac ...@@ -2138,7 +2138,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Optimize(IDirect3DRMMeshBuilder3 *ifac
static HRESULT WINAPI d3drm_mesh_builder3_AddFacesIndexed(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_AddFacesIndexed(IDirect3DRMMeshBuilder3 *iface,
DWORD flags, DWORD *indices, DWORD *start_idx, DWORD *count) DWORD flags, DWORD *indices, DWORD *start_idx, DWORD *count)
{ {
FIXME("iface %p, flags %#x, indices %p, start_idx %p, count %p stub!\n", FIXME("iface %p, flags %#lx, indices %p, start_idx %p, count %p stub!\n",
iface, flags, indices, start_idx, count); iface, flags, indices, start_idx, count);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -2154,7 +2154,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateSubMesh(IDirect3DRMMeshBuilder3 ...@@ -2154,7 +2154,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateSubMesh(IDirect3DRMMeshBuilder3
static HRESULT WINAPI d3drm_mesh_builder3_GetParentMesh(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_GetParentMesh(IDirect3DRMMeshBuilder3 *iface,
DWORD flags, IUnknown **parent) DWORD flags, IUnknown **parent)
{ {
FIXME("iface %p, flags %#x, parent %p stub!\n", iface, flags, parent); FIXME("iface %p, flags %#lx, parent %p stub!\n", iface, flags, parent);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2176,7 +2176,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_DeleteSubMesh(IDirect3DRMMeshBuilder3 ...@@ -2176,7 +2176,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_DeleteSubMesh(IDirect3DRMMeshBuilder3
static HRESULT WINAPI d3drm_mesh_builder3_Enable(IDirect3DRMMeshBuilder3 *iface, DWORD index) static HRESULT WINAPI d3drm_mesh_builder3_Enable(IDirect3DRMMeshBuilder3 *iface, DWORD index)
{ {
FIXME("iface %p, index %u stub!\n", iface, index); FIXME("iface %p, index %lu stub!\n", iface, index);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2191,7 +2191,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetEnable(IDirect3DRMMeshBuilder3 *ifa ...@@ -2191,7 +2191,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetEnable(IDirect3DRMMeshBuilder3 *ifa
static HRESULT WINAPI d3drm_mesh_builder3_AddTriangles(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_AddTriangles(IDirect3DRMMeshBuilder3 *iface,
DWORD flags, DWORD format, DWORD vertex_count, void *data) DWORD flags, DWORD format, DWORD vertex_count, void *data)
{ {
FIXME("iface %p, flags %#x, format %#x, vertex_count %u, data %p stub!\n", FIXME("iface %p, flags %#lx, format %#lx, vertex_count %lu, data %p stub!\n",
iface, flags, format, vertex_count, data); iface, flags, format, vertex_count, data);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -2200,7 +2200,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddTriangles(IDirect3DRMMeshBuilder3 * ...@@ -2200,7 +2200,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_AddTriangles(IDirect3DRMMeshBuilder3 *
static HRESULT WINAPI d3drm_mesh_builder3_SetVertices(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_SetVertices(IDirect3DRMMeshBuilder3 *iface,
DWORD start_idx, DWORD count, D3DVECTOR *vector) DWORD start_idx, DWORD count, D3DVECTOR *vector)
{ {
FIXME("iface %p, start_idx %u, count %u, vector %p stub!\n", iface, start_idx, count, vector); FIXME("iface %p, start_idx %lu, count %lu, vector %p stub!\n", iface, start_idx, count, vector);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2211,7 +2211,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertices(IDirect3DRMMeshBuilder3 *i ...@@ -2211,7 +2211,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertices(IDirect3DRMMeshBuilder3 *i
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface);
DWORD count = mesh_builder->nb_vertices - start_idx; DWORD count = mesh_builder->nb_vertices - start_idx;
TRACE("iface %p, start_idx %u, vertex_count %p, vertices %p.\n", TRACE("iface %p, start_idx %lu, vertex_count %p, vertices %p.\n",
iface, start_idx, vertex_count, vertices); iface, start_idx, vertex_count, vertices);
if (vertex_count) if (vertex_count)
...@@ -2225,7 +2225,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertices(IDirect3DRMMeshBuilder3 *i ...@@ -2225,7 +2225,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertices(IDirect3DRMMeshBuilder3 *i
static HRESULT WINAPI d3drm_mesh_builder3_SetNormals(IDirect3DRMMeshBuilder3 *iface, static HRESULT WINAPI d3drm_mesh_builder3_SetNormals(IDirect3DRMMeshBuilder3 *iface,
DWORD start_idx, DWORD count, D3DVECTOR *vector) DWORD start_idx, DWORD count, D3DVECTOR *vector)
{ {
FIXME("iface %p, start_idx %u, count %u, vector %p stub!\n", FIXME("iface %p, start_idx %lu, count %lu, vector %p stub!\n",
iface, start_idx, count, vector); iface, start_idx, count, vector);
return E_NOTIMPL; return E_NOTIMPL;
...@@ -2237,7 +2237,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetNormals(IDirect3DRMMeshBuilder3 *if ...@@ -2237,7 +2237,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetNormals(IDirect3DRMMeshBuilder3 *if
struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface);
DWORD count = mesh_builder->nb_normals - start_idx; DWORD count = mesh_builder->nb_normals - start_idx;
TRACE("iface %p, start_idx %u, normal_count %p, normals %p.\n", TRACE("iface %p, start_idx %lu, normal_count %p, normals %p.\n",
iface, start_idx, normal_count, normals); iface, start_idx, normal_count, normals);
if (normal_count) if (normal_count)
...@@ -2379,7 +2379,7 @@ static ULONG WINAPI d3drm_mesh_AddRef(IDirect3DRMMesh *iface) ...@@ -2379,7 +2379,7 @@ static ULONG WINAPI d3drm_mesh_AddRef(IDirect3DRMMesh *iface)
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
ULONG refcount = InterlockedIncrement(&mesh->ref); ULONG refcount = InterlockedIncrement(&mesh->ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -2389,7 +2389,7 @@ static ULONG WINAPI d3drm_mesh_Release(IDirect3DRMMesh *iface) ...@@ -2389,7 +2389,7 @@ static ULONG WINAPI d3drm_mesh_Release(IDirect3DRMMesh *iface)
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
ULONG refcount = InterlockedDecrement(&mesh->ref); ULONG refcount = InterlockedDecrement(&mesh->ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -2445,7 +2445,7 @@ static HRESULT WINAPI d3drm_mesh_SetAppData(IDirect3DRMMesh *iface, DWORD data) ...@@ -2445,7 +2445,7 @@ static HRESULT WINAPI d3drm_mesh_SetAppData(IDirect3DRMMesh *iface, DWORD data)
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
mesh->obj.appdata = data; mesh->obj.appdata = data;
...@@ -2573,7 +2573,7 @@ static HRESULT WINAPI d3drm_mesh_SetVertices(IDirect3DRMMesh *iface, D3DRMGROUPI ...@@ -2573,7 +2573,7 @@ static HRESULT WINAPI d3drm_mesh_SetVertices(IDirect3DRMMesh *iface, D3DRMGROUPI
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, group_id %#x, start_idx %u, count %u, values %p.\n", TRACE("iface %p, group_id %#lx, start_idx %u, count %u, values %p.\n",
iface, group_id, start_idx, count, values); iface, group_id, start_idx, count, values);
if (group_id >= mesh->nb_groups) if (group_id >= mesh->nb_groups)
...@@ -2594,7 +2594,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColor(IDirect3DRMMesh *iface, D3DRMGROU ...@@ -2594,7 +2594,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColor(IDirect3DRMMesh *iface, D3DRMGROU
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, id %#x, color 0x%08x.\n", iface, id, color); TRACE("iface %p, id %#lx, color 0x%08lx.\n", iface, id, color);
if (id >= mesh->nb_groups) if (id >= mesh->nb_groups)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -2609,7 +2609,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColorRGB(IDirect3DRMMesh *iface, ...@@ -2609,7 +2609,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColorRGB(IDirect3DRMMesh *iface,
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, id %#x, red %.8e, green %.8e, blue %.8e.\n", iface, id, red, green, blue); TRACE("iface %p, id %#lx, red %.8e, green %.8e, blue %.8e.\n", iface, id, red, green, blue);
if (id >= mesh->nb_groups) if (id >= mesh->nb_groups)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -2621,14 +2621,14 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColorRGB(IDirect3DRMMesh *iface, ...@@ -2621,14 +2621,14 @@ static HRESULT WINAPI d3drm_mesh_SetGroupColorRGB(IDirect3DRMMesh *iface,
static HRESULT WINAPI d3drm_mesh_SetGroupMapping(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id, D3DRMMAPPING value) static HRESULT WINAPI d3drm_mesh_SetGroupMapping(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id, D3DRMMAPPING value)
{ {
FIXME("iface %p, id %#x, value %#x stub!\n", iface, id, value); FIXME("iface %p, id %#lx, value %#lx stub!\n", iface, id, value);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI d3drm_mesh_SetGroupQuality(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id, D3DRMRENDERQUALITY value) static HRESULT WINAPI d3drm_mesh_SetGroupQuality(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id, D3DRMRENDERQUALITY value)
{ {
FIXME("iface %p, id %#x, value %#x stub!\n", iface, id, value); FIXME("iface %p, id %#lx, value %#lx stub!\n", iface, id, value);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2638,7 +2638,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupMaterial(IDirect3DRMMesh *iface, ...@@ -2638,7 +2638,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupMaterial(IDirect3DRMMesh *iface,
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, id %#x, material %p.\n", iface, id, material); TRACE("iface %p, id %#lx, material %p.\n", iface, id, material);
if (id >= mesh->nb_groups) if (id >= mesh->nb_groups)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -2659,7 +2659,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupTexture(IDirect3DRMMesh *iface, ...@@ -2659,7 +2659,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupTexture(IDirect3DRMMesh *iface,
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, id %#x, texture %p.\n", iface, id, texture); TRACE("iface %p, id %#lx, texture %p.\n", iface, id, texture);
if (id >= mesh->nb_groups) if (id >= mesh->nb_groups)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -2690,7 +2690,7 @@ static HRESULT WINAPI d3drm_mesh_GetGroup(IDirect3DRMMesh *iface, D3DRMGROUPINDE ...@@ -2690,7 +2690,7 @@ static HRESULT WINAPI d3drm_mesh_GetGroup(IDirect3DRMMesh *iface, D3DRMGROUPINDE
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, id %#x, vertex_count %p, face_count %p, vertex_per_face %p, face_data_size %p, face_data %p.\n", TRACE("iface %p, id %#lx, vertex_count %p, face_count %p, vertex_per_face %p, face_data_size %p, face_data %p.\n",
iface, id, vertex_count, face_count, vertex_per_face, face_data_size,face_data); iface, id, vertex_count, face_count, vertex_per_face, face_data_size,face_data);
if (id >= mesh->nb_groups) if (id >= mesh->nb_groups)
...@@ -2715,7 +2715,7 @@ static HRESULT WINAPI d3drm_mesh_GetVertices(IDirect3DRMMesh *iface, ...@@ -2715,7 +2715,7 @@ static HRESULT WINAPI d3drm_mesh_GetVertices(IDirect3DRMMesh *iface,
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, group_id %#x, start_idx %u, count %u, vertices %p.\n", TRACE("iface %p, group_id %#lx, start_idx %lu, count %lu, vertices %p.\n",
iface, group_id, start_idx, count, vertices); iface, group_id, start_idx, count, vertices);
if (group_id >= mesh->nb_groups) if (group_id >= mesh->nb_groups)
...@@ -2736,20 +2736,20 @@ static D3DCOLOR WINAPI d3drm_mesh_GetGroupColor(IDirect3DRMMesh *iface, D3DRMGRO ...@@ -2736,20 +2736,20 @@ static D3DCOLOR WINAPI d3drm_mesh_GetGroupColor(IDirect3DRMMesh *iface, D3DRMGRO
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, id %#x.\n", iface, id); TRACE("iface %p, id %#lx.\n", iface, id);
return mesh->groups[id].color; return mesh->groups[id].color;
} }
static D3DRMMAPPING WINAPI d3drm_mesh_GetGroupMapping(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id) static D3DRMMAPPING WINAPI d3drm_mesh_GetGroupMapping(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id)
{ {
FIXME("iface %p, id %#x stub!\n", iface, id); FIXME("iface %p, id %#lx stub!\n", iface, id);
return 0; return 0;
} }
static D3DRMRENDERQUALITY WINAPI d3drm_mesh_GetGroupQuality(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id) static D3DRMRENDERQUALITY WINAPI d3drm_mesh_GetGroupQuality(IDirect3DRMMesh *iface, D3DRMGROUPINDEX id)
{ {
FIXME("iface %p, id %#x stub!\n", iface, id); FIXME("iface %p, id %#lx stub!\n", iface, id);
return 0; return 0;
} }
...@@ -2759,7 +2759,7 @@ static HRESULT WINAPI d3drm_mesh_GetGroupMaterial(IDirect3DRMMesh *iface, ...@@ -2759,7 +2759,7 @@ static HRESULT WINAPI d3drm_mesh_GetGroupMaterial(IDirect3DRMMesh *iface,
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, id %#x, material %p.\n", iface, id, material); TRACE("iface %p, id %#lx, material %p.\n", iface, id, material);
if (id >= mesh->nb_groups) if (id >= mesh->nb_groups)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -2780,7 +2780,7 @@ static HRESULT WINAPI d3drm_mesh_GetGroupTexture(IDirect3DRMMesh *iface, ...@@ -2780,7 +2780,7 @@ static HRESULT WINAPI d3drm_mesh_GetGroupTexture(IDirect3DRMMesh *iface,
{ {
struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);
TRACE("iface %p, id %#x, texture %p.\n", iface, id, texture); TRACE("iface %p, id %#lx, texture %p.\n", iface, id, texture);
if (id >= mesh->nb_groups) if (id >= mesh->nb_groups)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
...@@ -2876,7 +2876,7 @@ static ULONG WINAPI d3drm_wrap_AddRef(IDirect3DRMWrap *iface) ...@@ -2876,7 +2876,7 @@ static ULONG WINAPI d3drm_wrap_AddRef(IDirect3DRMWrap *iface)
struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface); struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface);
ULONG refcount = InterlockedIncrement(&wrap->ref); ULONG refcount = InterlockedIncrement(&wrap->ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -2886,7 +2886,7 @@ static ULONG WINAPI d3drm_wrap_Release(IDirect3DRMWrap *iface) ...@@ -2886,7 +2886,7 @@ static ULONG WINAPI d3drm_wrap_Release(IDirect3DRMWrap *iface)
struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface); struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface);
ULONG refcount = InterlockedDecrement(&wrap->ref); ULONG refcount = InterlockedDecrement(&wrap->ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -2929,7 +2929,7 @@ static HRESULT WINAPI d3drm_wrap_SetAppData(IDirect3DRMWrap *iface, DWORD data) ...@@ -2929,7 +2929,7 @@ static HRESULT WINAPI d3drm_wrap_SetAppData(IDirect3DRMWrap *iface, DWORD data)
{ {
struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface); struct d3drm_wrap *wrap = impl_from_IDirect3DRMWrap(iface);
TRACE("iface %p, data %#x.\n", iface, data); TRACE("iface %p, data %#lx.\n", iface, data);
wrap->obj.appdata = data; wrap->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