Skip to content

W
wine-cw
Commit 24a4b8ca authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard
Browse files
Options

d3dx9: Build without -DWINE_NO_LONG_TYPES.

Based on a patch by Eric Pouech. Signed-off-by: 's avatarMatteo Bruni <mbruni@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 29a84c9c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 225 deletions
dlls/d3dx9_24/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=24
EXTRADEFS = -DD3DX_SDK_VERSION=24
MODULE = d3dx9_24.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_25/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=25
EXTRADEFS = -DD3DX_SDK_VERSION=25
MODULE = d3dx9_25.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_26/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=26
EXTRADEFS = -DD3DX_SDK_VERSION=26
MODULE = d3dx9_26.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_27/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=27
EXTRADEFS = -DD3DX_SDK_VERSION=27
MODULE = d3dx9_27.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_28/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=28
EXTRADEFS = -DD3DX_SDK_VERSION=28
MODULE = d3dx9_28.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_29/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=29
EXTRADEFS = -DD3DX_SDK_VERSION=29
MODULE = d3dx9_29.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_30/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=30
EXTRADEFS = -DD3DX_SDK_VERSION=30
MODULE = d3dx9_30.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_31/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=31
EXTRADEFS = -DD3DX_SDK_VERSION=31
MODULE = d3dx9_31.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_32/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=32
EXTRADEFS = -DD3DX_SDK_VERSION=32
MODULE = d3dx9_32.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_33/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=33
EXTRADEFS = -DD3DX_SDK_VERSION=33
MODULE = d3dx9_33.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_34/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=34
EXTRADEFS = -DD3DX_SDK_VERSION=34
MODULE = d3dx9_34.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_35/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=35
EXTRADEFS = -DD3DX_SDK_VERSION=35
MODULE = d3dx9_35.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_36/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=36
EXTRADEFS = -DD3DX_SDK_VERSION=36
MODULE = d3dx9_36.dll
IMPORTLIB = d3dx9
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
......
dlls/d3dx9_36/animation.c
View file @ 24a4b8ca
......@@ -61,7 +61,7 @@ static ULONG WINAPI d3dx9_animation_controller_AddRef(ID3DXAnimationController *
struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface);
ULONG refcount = InterlockedIncrement(&animation->ref);
TRACE("%p increasing refcount to %u.\n", animation, refcount);
TRACE("%p increasing refcount to %lu.\n", animation, refcount);
return refcount;
}
......@@ -71,7 +71,7 @@ static ULONG WINAPI d3dx9_animation_controller_Release(ID3DXAnimationController
struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface);
ULONG refcount = InterlockedDecrement(&animation->ref);
TRACE("%p decreasing refcount to %u.\n", animation, refcount);
TRACE("%p decreasing refcount to %lu.\n", animation, refcount);
if (!refcount)
{
......@@ -321,7 +321,7 @@ static D3DXEVENTHANDLE WINAPI d3dx9_animation_controller_KeyTrackBlend(ID3DXAnim
static HRESULT WINAPI d3dx9_animation_controller_UnkeyEvent(ID3DXAnimationController *iface, D3DXEVENTHANDLE event)
{
FIXME("iface %p, event %u stub.\n", iface, event);
FIXME("iface %p, event %lu stub.\n", iface, event);
return E_NOTIMPL;
}
......@@ -358,7 +358,7 @@ static D3DXEVENTHANDLE WINAPI d3dx9_animation_controller_GetCurrentPriorityBlend
static D3DXEVENTHANDLE WINAPI d3dx9_animation_controller_GetUpcomingTrackEvent(ID3DXAnimationController *iface,
UINT track, D3DXEVENTHANDLE event)
{
FIXME("iface %p, track %u, event %u stub.\n", iface, track, event);
FIXME("iface %p, track %u, event %lu stub.\n", iface, track, event);
return 0;
}
......@@ -366,14 +366,14 @@ static D3DXEVENTHANDLE WINAPI d3dx9_animation_controller_GetUpcomingTrackEvent(I
static D3DXEVENTHANDLE WINAPI d3dx9_animation_controller_GetUpcomingPriorityBlend(ID3DXAnimationController *iface,
D3DXEVENTHANDLE event)
{
FIXME("iface %p, event %u stub.\n", iface, event);
FIXME("iface %p, event %lu stub.\n", iface, event);
return 0;
}
static HRESULT WINAPI d3dx9_animation_controller_ValidateEvent(ID3DXAnimationController *iface, D3DXEVENTHANDLE event)
{
FIXME("iface %p, event %u stub.\n", iface, event);
FIXME("iface %p, event %lu stub.\n", iface, event);
return E_NOTIMPL;
}
......@@ -381,7 +381,7 @@ static HRESULT WINAPI d3dx9_animation_controller_ValidateEvent(ID3DXAnimationCon
static HRESULT WINAPI d3dx9_animation_controller_GetEventDesc(ID3DXAnimationController *iface,
D3DXEVENTHANDLE event, D3DXEVENT_DESC *desc)
{
FIXME("iface %p, event %u, desc %p stub.\n", iface, event, desc);
FIXME("iface %p, event %lu, desc %p stub.\n", iface, event, desc);
return E_NOTIMPL;
}
......@@ -510,7 +510,7 @@ static ULONG WINAPI d3dx9_keyframed_animation_AddRef(ID3DXKeyframedAnimationSet
struct d3dx9_keyframed_animation_set *set = impl_from_ID3DXKeyframedAnimationSet(iface);
ULONG refcount = InterlockedIncrement(&set->ref);
TRACE("%p increasing refcount to %u.\n", set, refcount);
TRACE("%p increasing refcount to %lu.\n", set, refcount);
return refcount;
}
......@@ -520,7 +520,7 @@ static ULONG WINAPI d3dx9_keyframed_animation_Release(ID3DXKeyframedAnimationSet
struct d3dx9_keyframed_animation_set *set = impl_from_ID3DXKeyframedAnimationSet(iface);
ULONG refcount = InterlockedDecrement(&set->ref);
TRACE("%p decreasing refcount to %u.\n", set, refcount);
TRACE("%p decreasing refcount to %lu.\n", set, refcount);
if (!refcount)
{
......@@ -596,7 +596,7 @@ static HRESULT WINAPI d3dx9_keyframed_animation_GetCallback(ID3DXKeyframedAnimat
{
struct d3dx9_keyframed_animation_set *set = impl_from_ID3DXKeyframedAnimationSet(iface);
FIXME("set %p, position %.16e, flags %#x, callback_position %p, callback_data %p stub.\n",
FIXME("set %p, position %.16e, flags %#lx, callback_position %p, callback_data %p stub.\n",
set, position, flags, callback_position, callback_data);
return E_NOTIMPL;
}
......@@ -803,7 +803,7 @@ static HRESULT WINAPI d3dx9_keyframed_animation_Compress(ID3DXKeyframedAnimation
{
struct d3dx9_keyframed_animation_set *set = impl_from_ID3DXKeyframedAnimationSet(iface);
FIXME("set %p, flags %#x, lossiness %.8e, hierarchy %p, compressed_data %p stub.\n",
FIXME("set %p, flags %#lx, lossiness %.8e, hierarchy %p, compressed_data %p stub.\n",
set, flags, lossiness, hierarchy, compressed_data);
return E_NOTIMPL;
}
......
dlls/d3dx9_36/core.c
View file @ 24a4b8ca
......@@ -58,7 +58,7 @@ static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface)
struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("%p increasing refcount to %u\n", This, ref);
TRACE("%p increasing refcount to %lu.\n", This, ref);
return ref;
}
......@@ -68,7 +68,7 @@ static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface)
struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("%p decreasing refcount to %u\n", This, ref);
TRACE("%p decreasing refcount to %lu.\n", This, ref);
if (ref == 0)
{
......@@ -129,7 +129,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD size, ID3DXBuffer **buffer)
struct ID3DXBufferImpl *object;
HRESULT hr;
TRACE("size %u, buffer %p.\n", size, buffer);
TRACE("size %lu, buffer %p.\n", size, buffer);
if (!buffer)
{
......@@ -144,7 +144,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD size, ID3DXBuffer **buffer)
hr = d3dx9_buffer_init(object, size);
if (FAILED(hr))
{
WARN("Failed to initialize buffer, hr %#x.\n", hr);
WARN("Failed to initialize buffer, hr %#lx.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
return hr;
}
......
dlls/d3dx9_36/font.c
View file @ 24a4b8ca
......@@ -97,7 +97,7 @@ static ULONG WINAPI ID3DXFontImpl_AddRef(ID3DXFont *iface)
struct d3dx_font *font = impl_from_ID3DXFont(iface);
ULONG ref = InterlockedIncrement(&font->ref);
TRACE("%p increasing refcount to %u\n", iface, ref);
TRACE("%p increasing refcount to %lu.\n", iface, ref);
return ref;
}
......@@ -107,7 +107,7 @@ static ULONG WINAPI ID3DXFontImpl_Release(ID3DXFont *iface)
ULONG ref = InterlockedDecrement(&font->ref);
unsigned int i;
TRACE("%p decreasing refcount to %u\n", iface, ref);
TRACE("%p decreasing refcount to %lu.\n", iface, ref);
if (!ref)
{
......@@ -486,7 +486,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite,
int ret, countW;
WCHAR *wstr;
TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x.\n",
TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#lx, color 0x%08lx.\n",
iface, sprite, debugstr_an(string, count), count, wine_dbgstr_rect(rect), format, color);
if (!string || !count)
......@@ -658,7 +658,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
WCHAR *line;
SIZE size;
TRACE("iface %p, sprite %p, string %s, in_count %d, rect %s, format %#x, color 0x%08x.\n",
TRACE("iface %p, sprite %p, string %s, in_count %d, rect %s, format %#lx, color 0x%08lx.\n",
iface, sprite, debugstr_wn(string, in_count), in_count, wine_dbgstr_rect(rect), format, color);
if (!string)
......
dlls/d3dx9_36/line.c
View file @ 24a4b8ca
......@@ -60,7 +60,7 @@ static ULONG WINAPI d3dx9_line_AddRef(ID3DXLine *iface)
struct d3dx9_line *line = impl_from_ID3DXLine(iface);
ULONG refcount = InterlockedIncrement(&line->ref);
TRACE("%p increasing refcount to %u.\n", line, refcount);
TRACE("%p increasing refcount to %lu.\n", line, refcount);
return refcount;
}
......@@ -70,7 +70,7 @@ static ULONG WINAPI d3dx9_line_Release(ID3DXLine *iface)
struct d3dx9_line *line = impl_from_ID3DXLine(iface);
ULONG refcount = InterlockedDecrement(&line->ref);
TRACE("%p decreasing refcount to %u.\n", line, refcount);
TRACE("%p decreasing refcount to %lu.\n", line, refcount);
if (!refcount)
{
......@@ -148,7 +148,7 @@ failed:
static HRESULT WINAPI d3dx9_line_Draw(ID3DXLine *iface, const D3DXVECTOR2 *vertex_list,
DWORD vertex_list_count, D3DCOLOR color)
{
FIXME("iface %p, vertex_list %p, vertex_list_count %u, color 0x%08x stub!\n",
FIXME("iface %p, vertex_list %p, vertex_list_count %lu, color 0x%08lx stub!\n",
iface, vertex_list, vertex_list_count, color);
return E_NOTIMPL;
......@@ -157,7 +157,7 @@ static HRESULT WINAPI d3dx9_line_Draw(ID3DXLine *iface, const D3DXVECTOR2 *verte
static HRESULT WINAPI d3dx9_line_DrawTransform(ID3DXLine *iface, const D3DXVECTOR3 *vertex_list,
DWORD vertex_list_count, const D3DXMATRIX *transform, D3DCOLOR color)
{
FIXME("iface %p, vertex_list %p, vertex_list_count %u, transform %p, color 0x%08x stub!\n",
FIXME("iface %p, vertex_list %p, vertex_list_count %lu, transform %p, color 0x%08lx stub!\n",
iface, vertex_list, vertex_list_count, transform, color);
return E_NOTIMPL;
......@@ -165,7 +165,7 @@ static HRESULT WINAPI d3dx9_line_DrawTransform(ID3DXLine *iface, const D3DXVECTO
static HRESULT WINAPI d3dx9_line_SetPattern(ID3DXLine *iface, DWORD pattern)
{
FIXME("iface %p, pattern 0x%08x stub!\n", iface, pattern);
FIXME("iface %p, pattern 0x%08lx stub!\n", iface, pattern);
return E_NOTIMPL;
}
......
dlls/d3dx9_36/math.c
View file @ 24a4b8ca
......@@ -913,23 +913,25 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *ifac
static ULONG WINAPI ID3DXMatrixStackImpl_AddRef(ID3DXMatrixStack *iface)
{
struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
struct ID3DXMatrixStackImpl *stack = impl_from_ID3DXMatrixStack(iface);
ULONG refcount = InterlockedIncrement(&stack->ref);
TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount;
}
static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack *iface)
{
struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface);
ULONG ref = InterlockedDecrement(&This->ref);
if (!ref)
struct ID3DXMatrixStackImpl *stack = impl_from_ID3DXMatrixStack(iface);
ULONG refcount = InterlockedDecrement(&stack->ref);
TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount)
{
HeapFree(GetProcessHeap(), 0, This->stack);
HeapFree(GetProcessHeap(), 0, This);
HeapFree(GetProcessHeap(), 0, stack->stack);
HeapFree(GetProcessHeap(), 0, stack);
}
TRACE("(%p) : ReleaseRef to %d\n", This, ref);
return ref;
return refcount;
}
static D3DXMATRIX* WINAPI ID3DXMatrixStackImpl_GetTop(ID3DXMatrixStack *iface)
......@@ -1170,7 +1172,7 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack)
{
struct ID3DXMatrixStackImpl *object;
TRACE("flags %#x, stack %p.\n", flags, stack);
TRACE("flags %#lx, stack %p.\n", flags, stack);
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
{
......@@ -3010,7 +3012,7 @@ HRESULT WINAPI D3DXSHProjectCubeMap(unsigned int order, IDirect3DCubeTexture9 *t
if (FAILED(hr = IDirect3DCubeTexture9_GetLevelDesc(texture, 0, &desc)))
{
ERR("Failed to get level desc, hr %#x.\n", hr);
ERR("Failed to get level desc, hr %#lx.\n", hr);
return hr;
}
......@@ -3036,7 +3038,7 @@ HRESULT WINAPI D3DXSHProjectCubeMap(unsigned int order, IDirect3DCubeTexture9 *t
if (FAILED(hr = IDirect3DCubeTexture9_LockRect(texture, face, 0, &map_desc, NULL, D3DLOCK_READONLY)))
{
ERR("Failed to map texture, hr %#x.\n", hr);
ERR("Failed to map texture, hr %#lx.\n", hr);
free(temp);
return hr;
}
......
dlls/d3dx9_36/preshader.c
View file @ 24a4b8ca
......@@ -861,16 +861,16 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab
D3DXHANDLE hc;
unsigned int i, j;
hr = D3DXGetShaderConstantTable(byte_code, &ctab);
hr = D3DXGetShaderConstantTable((DWORD *)byte_code, &ctab);
if (FAILED(hr) || !ctab)
{
TRACE("Could not get CTAB data, hr %#x.\n", hr);
TRACE("Could not get CTAB data, hr %#lx.\n", hr);
/* returning OK, shaders and preshaders without CTAB are valid */
return D3D_OK;
}
if (FAILED(hr = ID3DXConstantTable_GetDesc(ctab, &desc)))
{
FIXME("Could not get CTAB desc, hr %#x.\n", hr);
FIXME("Could not get CTAB desc, hr %#lx.\n", hr);
goto cleanup;
}
......@@ -1294,7 +1294,7 @@ HRESULT d3dx_create_param_eval(struct d3dx_effect *effect, void *byte_code, unsi
if (FAILED(ret = get_constants_desc(shader_ptr, &peval->shader_inputs, effect,
skip_constants, skip_constants_count, &peval->pres)))
{
TRACE("Could not get shader constant table, hr %#x.\n", ret);
TRACE("Could not get shader constant table, hr %#lx.\n", ret);
goto err_out;
}
update_table_sizes_consts(peval->pres.regs.table_sizes, &peval->shader_inputs);
......
dlls/d3dx9_36/render.c
View file @ 24a4b8ca
......@@ -151,7 +151,7 @@ static ULONG WINAPI D3DXRenderToSurface_AddRef(ID3DXRenderToSurface *iface)
struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface);
ULONG ref = InterlockedIncrement(&render->ref);
TRACE("%p increasing refcount to %u\n", iface, ref);
TRACE("%p increasing refcount to %lu.\n", iface, ref);
return ref;
}
......@@ -161,7 +161,7 @@ static ULONG WINAPI D3DXRenderToSurface_Release(ID3DXRenderToSurface *iface)
struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface);
ULONG ref = InterlockedDecrement(&render->ref);
TRACE("%p decreasing refcount to %u\n", iface, ref);
TRACE("%p decreasing refcount to %lu.\n", iface, ref);
if (!ref)
{
......@@ -185,7 +185,7 @@ static HRESULT WINAPI D3DXRenderToSurface_GetDevice(ID3DXRenderToSurface *iface,
{
struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface);
TRACE("(%p)->(%p)\n", iface, device);
TRACE("iface %p, device %p.\n", iface, device);
if (!device) return D3DERR_INVALIDCALL;
......@@ -199,7 +199,7 @@ static HRESULT WINAPI D3DXRenderToSurface_GetDesc(ID3DXRenderToSurface *iface,
{
struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface);
TRACE("(%p)->(%p)\n", iface, desc);
TRACE("iface %p, desc %p.\n", iface, desc);
if (!desc) return D3DERR_INVALIDCALL;
......@@ -219,7 +219,7 @@ static HRESULT WINAPI D3DXRenderToSurface_BeginScene(ID3DXRenderToSurface *iface
D3DMULTISAMPLE_TYPE multi_sample_type = D3DMULTISAMPLE_NONE;
DWORD multi_sample_quality = 0;
TRACE("(%p)->(%p, %p)\n", iface, surface, viewport);
TRACE("iface %p, surface %p, viewport %p.\n", iface, surface, viewport);
if (!surface || render->dst_surface) return D3DERR_INVALIDCALL;
......@@ -307,7 +307,7 @@ static HRESULT WINAPI D3DXRenderToSurface_EndScene(ID3DXRenderToSurface *iface,
struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface);
HRESULT hr;
TRACE("(%p)->(%#x)\n", iface, filter);
TRACE("iface %p, filter %#lx.\n", iface, filter);
if (!render->dst_surface) return D3DERR_INVALIDCALL;
......@@ -318,7 +318,8 @@ static HRESULT WINAPI D3DXRenderToSurface_EndScene(ID3DXRenderToSurface *iface,
{
hr = D3DXLoadSurfaceFromSurface(render->dst_surface, NULL, NULL,
render->render_target, NULL, NULL, filter, 0);
if (FAILED(hr)) ERR("Copying render target data to surface failed %#x\n", hr);
if (FAILED(hr))
ERR("Copying render target data to surface failed, hr %#lx.\n", hr);
}
device_state_restore(render->device, &render->previous_state);
......@@ -344,13 +345,13 @@ static HRESULT WINAPI D3DXRenderToSurface_EndScene(ID3DXRenderToSurface *iface,
static HRESULT WINAPI D3DXRenderToSurface_OnLostDevice(ID3DXRenderToSurface *iface)
{
FIXME("(%p)->(): stub\n", iface);
FIXME("iface %p stub!\n", iface);
return D3D_OK;
}
static HRESULT WINAPI D3DXRenderToSurface_OnResetDevice(ID3DXRenderToSurface *iface)
{
FIXME("(%p)->(): stub\n", iface);
FIXME("iface %p stub!\n", iface);
return D3D_OK;
}
......@@ -380,8 +381,8 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device,
HRESULT hr;
struct render_to_surface *render;
TRACE("(%p, %u, %u, %#x, %d, %#x, %p)\n", device, width, height, format,
depth_stencil, depth_stencil_format, out);
TRACE("device %p, width %u, height %u, format %#x, depth_stencil %#x, depth_stencil_format %#x, out %p.\n",
device, width, height, format, depth_stencil, depth_stencil_format, out);
if (!device || !out) return D3DERR_INVALIDCALL;
......@@ -453,7 +454,8 @@ static void copy_render_target_to_cube_texture_face(IDirect3DCubeTexture9 *cube_
IDirect3DCubeTexture9_GetCubeMapSurface(cube_texture, face, 0, &cube_surface);
hr = D3DXLoadSurfaceFromSurface(cube_surface, NULL, NULL, render_target, NULL, NULL, filter, 0);
if (FAILED(hr)) ERR("Copying render target data to surface failed %#x\n", hr);
if (FAILED(hr))
ERR("Copying render target data to surface failed, hr %#lx.\n", hr);
IDirect3DSurface9_Release(cube_surface);
}
......@@ -488,7 +490,7 @@ static ULONG WINAPI D3DXRenderToEnvMap_AddRef(ID3DXRenderToEnvMap *iface)
struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface);
ULONG ref = InterlockedIncrement(&render->ref);
TRACE("%p increasing refcount to %u\n", iface, ref);
TRACE("%p increasing refcount to %lu.\n", iface, ref);
return ref;
}
......@@ -498,7 +500,7 @@ static ULONG WINAPI D3DXRenderToEnvMap_Release(ID3DXRenderToEnvMap *iface)
struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface);
ULONG ref = InterlockedDecrement(&render->ref);
TRACE("%p decreasing refcount to %u\n", iface, ref);
TRACE("%p decreasing refcount to %lu.\n", iface, ref);
if (!ref)
{
......@@ -522,7 +524,7 @@ static HRESULT WINAPI D3DXRenderToEnvMap_GetDevice(ID3DXRenderToEnvMap *iface,
{
struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface);
TRACE("(%p)->(%p)\n", iface, device);
TRACE("iface %p, device %p.\n", iface, device);
if (!device) return D3DERR_INVALIDCALL;
......@@ -536,7 +538,7 @@ static HRESULT WINAPI D3DXRenderToEnvMap_GetDesc(ID3DXRenderToEnvMap *iface,
{
struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface);
TRACE("(%p)->(%p)\n", iface, desc);
TRACE("iface %p, desc %p.\n", iface, desc);
if (!desc) return D3DERR_INVALIDCALL;
......@@ -551,7 +553,7 @@ static HRESULT WINAPI D3DXRenderToEnvMap_BeginCube(ID3DXRenderToEnvMap *iface,
HRESULT hr;
D3DSURFACE_DESC level_desc;
TRACE("(%p)->(%p)\n", iface, texture);
TRACE("iface %p, texture %p.\n", iface, texture);
if (!texture) return D3DERR_INVALIDCALL;
......@@ -598,7 +600,7 @@ cleanup:
static HRESULT WINAPI D3DXRenderToEnvMap_BeginSphere(ID3DXRenderToEnvMap *iface,
IDirect3DTexture9 *texture)
{
FIXME("(%p)->(%p): stub\n", iface, texture);
FIXME("iface %p, texture %p stub!\n", iface, texture);
return E_NOTIMPL;
}
......@@ -606,7 +608,7 @@ static HRESULT WINAPI D3DXRenderToEnvMap_BeginHemisphere(ID3DXRenderToEnvMap *if
IDirect3DTexture9 *pos_z_texture,
IDirect3DTexture9 *neg_z_texture)
{
FIXME("(%p)->(%p, %p): stub\n", iface, pos_z_texture, neg_z_texture);
FIXME("iface %p, pos_z_texture %p, neg_z_texture %p stub!\n", iface, pos_z_texture, neg_z_texture);
return E_NOTIMPL;
}
......@@ -614,7 +616,7 @@ static HRESULT WINAPI D3DXRenderToEnvMap_BeginParabolic(ID3DXRenderToEnvMap *ifa
IDirect3DTexture9 *pos_z_texture,
IDirect3DTexture9 *neg_z_texture)
{
FIXME("(%p)->(%p, %p): stub\n", iface, pos_z_texture, neg_z_texture);
FIXME("iface %p, pos_z_texture %p, neg_z_texture %p stub!\n", iface, pos_z_texture, neg_z_texture);
return E_NOTIMPL;
}
......@@ -626,7 +628,7 @@ static HRESULT WINAPI D3DXRenderToEnvMap_Face(ID3DXRenderToEnvMap *iface,
HRESULT hr;
unsigned int i;
TRACE("(%p)->(%u, %#x)\n", iface, face, filter);
TRACE("iface %p, face %u, filter %#lx.\n", iface, face, filter);
if (render->state == CUBE_FACE)
{
......@@ -676,7 +678,7 @@ static HRESULT WINAPI D3DXRenderToEnvMap_End(ID3DXRenderToEnvMap *iface,
{
struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface);
TRACE("(%p)->(%#x)\n", iface, filter);
TRACE("iface %p, filter %#lx.\n", iface, filter);
if (render->state == INITIAL) return D3DERR_INVALIDCALL;
......@@ -713,13 +715,13 @@ static HRESULT WINAPI D3DXRenderToEnvMap_End(ID3DXRenderToEnvMap *iface,
static HRESULT WINAPI D3DXRenderToEnvMap_OnLostDevice(ID3DXRenderToEnvMap *iface)
{
FIXME("(%p)->(): stub\n", iface);
FIXME("iface %p stub!\n", iface);
return D3D_OK;
}
static HRESULT WINAPI D3DXRenderToEnvMap_OnResetDevice(ID3DXRenderToEnvMap *iface)
{
FIXME("(%p)->(): stub\n", iface);
FIXME("iface %p stub!\n", iface);
return D3D_OK;
}
......
dlls/d3dx9_36/sprite.c
View file @ 24a4b8ca
......@@ -94,7 +94,7 @@ static ULONG WINAPI d3dx9_sprite_AddRef(ID3DXSprite *iface)
struct d3dx9_sprite *sprite = impl_from_ID3DXSprite(iface);
ULONG refcount = InterlockedIncrement(&sprite->ref);
TRACE("%p increasing refcount to %u.\n", sprite, refcount);
TRACE("%p increasing refcount to %lu.\n", sprite, refcount);
return refcount;
}
......@@ -104,7 +104,7 @@ static ULONG WINAPI d3dx9_sprite_Release(ID3DXSprite *iface)
struct d3dx9_sprite *sprite = impl_from_ID3DXSprite(iface);
ULONG refcount = InterlockedDecrement(&sprite->ref);
TRACE("%p decreasing refcount to %u.\n", sprite, refcount);
TRACE("%p decreasing refcount to %lu.\n", sprite, refcount);
if (!refcount)
{
......@@ -279,7 +279,7 @@ static HRESULT WINAPI d3dx9_sprite_Begin(ID3DXSprite *iface, DWORD flags)
struct d3dx9_sprite *This = impl_from_ID3DXSprite(iface);
HRESULT hr;
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
if(flags>D3DXSPRITE_FLAGLIMIT || This->ready) return D3DERR_INVALIDCALL;
......@@ -295,10 +295,10 @@ D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often)
if(flags & (D3DXSPRITE_BILLBOARD |
D3DXSPRITE_DONOTMODIFY_RENDERSTATE | D3DXSPRITE_OBJECTSPACE |
D3DXSPRITE_SORT_DEPTH_BACKTOFRONT))
FIXME("Flags unsupported: %#x\n", flags);
FIXME("Flags unsupported: %#lx.\n", flags);
/* These flags should only matter to performance */
else if(flags & (D3DXSPRITE_SORT_DEPTH_FRONTTOBACK | D3DXSPRITE_SORT_TEXTURE))
TRACE("Flags unsupported: %#x\n", flags);
TRACE("Flags unsupported: %#lx.\n", flags);
if(This->vdecl==NULL) {
static const D3DVERTEXELEMENT9 elements[] =
......@@ -345,7 +345,7 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t
struct sprite *new_sprites;
D3DSURFACE_DESC texdesc;
TRACE("iface %p, texture %p, rect %s, center %p, position %p, color 0x%08x.\n",
TRACE("iface %p, texture %p, rect %s, center %p, position %p, color 0x%08lx.\n",
iface, texture, wine_dbgstr_rect(rect), center, position, color);
if(texture==NULL) return D3DERR_INVALIDCALL;
......
dlls/d3dx9_36/volume.c
View file @ 24a4b8ca
......@@ -21,22 +21,17 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
HRESULT WINAPI D3DXLoadVolumeFromFileA(IDirect3DVolume9 *dst_volume,
const PALETTEENTRY *dst_palette,
const D3DBOX *dst_box,
const char *filename,
const D3DBOX *src_box,
DWORD filter,
D3DCOLOR color_key,
D3DXIMAGE_INFO *info)
HRESULT WINAPI D3DXLoadVolumeFromFileA(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette,
const D3DBOX *dst_box, const char *filename, const D3DBOX *src_box, DWORD filter,
D3DCOLOR color_key, D3DXIMAGE_INFO *info)
{
HRESULT hr;
int length;
WCHAR *filenameW;
TRACE("(%p, %p, %p, %s, %p, %#x, %#x, %p)\n",
dst_volume, dst_palette, dst_box, debugstr_a(filename), src_box,
filter, color_key, info);
TRACE("dst_volume %p, dst_palette %p, dst_box %p, filename %s, src_box %p, filter %#lx, "
"color_key 0x%08lx, info %p.\n",
dst_volume, dst_palette, dst_box, debugstr_a(filename), src_box, filter, color_key, info);
if (!dst_volume || !filename) return D3DERR_INVALIDCALL;
......@@ -51,22 +46,17 @@ HRESULT WINAPI D3DXLoadVolumeFromFileA(IDirect3DVolume9 *dst_volume,
return hr;
}
HRESULT WINAPI D3DXLoadVolumeFromFileW(IDirect3DVolume9 *dst_volume,
const PALETTEENTRY *dst_palette,
const D3DBOX *dst_box,
const WCHAR *filename,
const D3DBOX *src_box,
DWORD filter,
D3DCOLOR color_key,
D3DXIMAGE_INFO *info)
HRESULT WINAPI D3DXLoadVolumeFromFileW(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette,
const D3DBOX *dst_box, const WCHAR *filename, const D3DBOX *src_box, DWORD filter,
D3DCOLOR color_key, D3DXIMAGE_INFO *info)
{
DWORD data_size;
HRESULT hr;
void *data;
TRACE("(%p, %p, %p, %s, %p, %#x, %#x, %p)\n",
dst_volume, dst_palette, dst_box, debugstr_w(filename), src_box,
filter, color_key, info);
TRACE("dst_volume %p, dst_palette %p, dst_box %p, filename %s, src_box %p, filter %#lx, "
"color_key 0x%08lx, info %p.\n",
dst_volume, dst_palette, dst_box, debugstr_w(filename), src_box, filter, color_key, info);
if (!dst_volume || !filename) return D3DERR_INVALIDCALL;
......@@ -81,16 +71,9 @@ HRESULT WINAPI D3DXLoadVolumeFromFileW(IDirect3DVolume9 *dst_volume,
}
HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume,
const PALETTEENTRY *dst_palette,
const D3DBOX *dst_box,
const void *src_memory,
D3DFORMAT src_format,
UINT src_row_pitch,
UINT src_slice_pitch,
const PALETTEENTRY *src_palette,
const D3DBOX *src_box,
DWORD filter,
D3DCOLOR color_key)
const PALETTEENTRY *dst_palette, const D3DBOX *dst_box, const void *src_memory,
D3DFORMAT src_format, UINT src_row_pitch, UINT src_slice_pitch,
const PALETTEENTRY *src_palette, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key)
{
HRESULT hr;
D3DVOLUME_DESC desc;
......@@ -98,9 +81,10 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume,
struct volume dst_size, src_size;
const struct pixel_format_desc *src_format_desc, *dst_format_desc;
TRACE("(%p, %p, %p, %p, %#x, %u, %u, %p, %p, %x, %x)\n", dst_volume, dst_palette, dst_box,
src_memory, src_format, src_row_pitch, src_slice_pitch, src_palette, src_box,
filter, color_key);
TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_memory %p, src_format %#x, "
"src_row_pitch %u, src_slice_pitch %u, src_palette %p, src_box %p, filter %#lx, color_key 0x%08lx.\n",
dst_volume, dst_palette, dst_box, src_memory, src_format, src_row_pitch, src_slice_pitch,
src_palette, src_box, filter, color_key);
if (!dst_volume || !src_memory || !src_box) return D3DERR_INVALIDCALL;
......@@ -210,7 +194,7 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume,
else
{
if ((filter & 0xf) != D3DX_FILTER_POINT)
FIXME("Unhandled filter %#x.\n", filter);
FIXME("Unhandled filter %#lx.\n", filter);
point_filter_argb_pixels(src_addr, src_row_pitch, src_slice_pitch, &src_size, src_format_desc,
locked_box.pBits, locked_box.RowPitch, locked_box.SlicePitch, &dst_size, dst_format_desc, color_key,
......@@ -223,22 +207,16 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume,
return D3D_OK;
}
HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume,
const PALETTEENTRY *dst_palette,
const D3DBOX *dst_box,
const void *src_data,
UINT src_data_size,
const D3DBOX *src_box,
DWORD filter,
D3DCOLOR color_key,
D3DXIMAGE_INFO *src_info)
HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette,
const D3DBOX *dst_box, const void *src_data, UINT src_data_size, const D3DBOX *src_box,
DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info)
{
HRESULT hr;
D3DBOX box;
D3DXIMAGE_INFO image_info;
TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_data %p, src_data_size %u, src_box %p, "
"filter %#x, color_key 0x%08x, src_info %p.\n",
"filter %#lx, color_key 0x%08lx, src_info %p.\n",
dst_volume, dst_palette, dst_box, src_data, src_data_size, src_box,
filter, color_key, src_info);
......@@ -284,23 +262,18 @@ HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume,
return D3D_OK;
}
HRESULT WINAPI D3DXLoadVolumeFromVolume(IDirect3DVolume9 *dst_volume,
const PALETTEENTRY *dst_palette,
const D3DBOX *dst_box,
IDirect3DVolume9 *src_volume,
const PALETTEENTRY *src_palette,
const D3DBOX *src_box,
DWORD filter,
D3DCOLOR color_key)
HRESULT WINAPI D3DXLoadVolumeFromVolume(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette,
const D3DBOX *dst_box, IDirect3DVolume9 *src_volume, const PALETTEENTRY *src_palette,
const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key)
{
HRESULT hr;
D3DBOX box;
D3DVOLUME_DESC desc;
D3DLOCKED_BOX locked_box;
TRACE("(%p, %p, %p, %p, %p, %p, %#x, %#x)\n",
dst_volume, dst_palette, dst_box, src_volume, src_palette, src_box,
filter, color_key);
TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_volume %p, src_palette %p, src_box %p, "
"filter %#lx, color_key 0x%08lx.\n",
dst_volume, dst_palette, dst_box, src_volume, src_palette, src_box, filter, color_key);
if (!dst_volume || !src_volume) return D3DERR_INVALIDCALL;
......
dlls/d3dx9_36/xfile.c
View file @ 24a4b8ca
......@@ -40,7 +40,7 @@ static HRESULT error_dxfile_to_d3dxfile(HRESULT error)
case DXFILEERR_BADVALUE:
return D3DXFERR_BADVALUE;
default:
FIXME("Cannot map error %#x\n", error);
FIXME("Cannot map error %#lx.\n", error);
return E_FAIL;
}
}
......@@ -108,7 +108,7 @@ static ULONG WINAPI d3dx9_file_data_AddRef(ID3DXFileData *iface)
struct d3dx9_file_data *file_data = impl_from_ID3DXFileData(iface);
ULONG refcount = InterlockedIncrement(&file_data->ref);
TRACE("%p increasing refcount to %u.\n", file_data, refcount);
TRACE("%p increasing refcount to %lu.\n", file_data, refcount);
return refcount;
}
......@@ -118,7 +118,7 @@ static ULONG WINAPI d3dx9_file_data_Release(ID3DXFileData *iface)
struct d3dx9_file_data *file_data = impl_from_ID3DXFileData(iface);
ULONG refcount = InterlockedDecrement(&file_data->ref);
TRACE("%p decreasing refcount to %u.\n", file_data, refcount);
TRACE("%p decreasing refcount to %lu.\n", file_data, refcount);
if (!refcount)
{
......@@ -265,7 +265,7 @@ static HRESULT WINAPI d3dx9_file_data_GetChild(ID3DXFileData *iface, SIZE_T id,
{
struct d3dx9_file_data *file_data = impl_from_ID3DXFileData(iface);
TRACE("iface %p, id %#lx, object %p.\n", iface, id, object);
TRACE("iface %p, id %#Ix, object %p.\n", iface, id, object);
if (!object)
return E_POINTER;
......@@ -410,7 +410,7 @@ static ULONG WINAPI d3dx9_file_enum_object_AddRef(ID3DXFileEnumObject *iface)
struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface);
ULONG refcount = InterlockedIncrement(&file_enum->ref);
TRACE("%p increasing refcount to %u.\n", file_enum, refcount);
TRACE("%p increasing refcount to %lu.\n", file_enum, refcount);
return refcount;
}
......@@ -420,7 +420,7 @@ static ULONG WINAPI d3dx9_file_enum_object_Release(ID3DXFileEnumObject *iface)
struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface);
ULONG refcount = InterlockedDecrement(&file_enum->ref);
TRACE("%p decreasing refcount to %u.\n", file_enum, refcount);
TRACE("%p decreasing refcount to %lu.\n", file_enum, refcount);
if (!refcount)
{
......@@ -463,7 +463,7 @@ static HRESULT WINAPI d3dx9_file_enum_object_GetChild(ID3DXFileEnumObject *iface
{
struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface);
TRACE("iface %p, id %#lx, object %p.\n", iface, id, object);
TRACE("iface %p, id %#Ix, object %p.\n", iface, id, object);
if (!object)
return E_POINTER;
......@@ -525,7 +525,7 @@ static ULONG WINAPI d3dx9_file_AddRef(ID3DXFile *iface)
struct d3dx9_file *file = impl_from_ID3DXFile(iface);
ULONG refcount = InterlockedIncrement(&file->ref);
TRACE("%p increasing refcount to %u.\n", file, refcount);
TRACE("%p increasing refcount to %lu.\n", file, refcount);
return refcount;
}
......@@ -535,7 +535,7 @@ static ULONG WINAPI d3dx9_file_Release(ID3DXFile *iface)
struct d3dx9_file *file = impl_from_ID3DXFile(iface);
ULONG refcount = InterlockedDecrement(&file->ref);
TRACE("%p decreasing refcount to %u.\n", file, refcount);
TRACE("%p decreasing refcount to %lu.\n", file, refcount);
if (!refcount)
{
......@@ -560,7 +560,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void *
unsigned children_array_size = 0;
HRESULT ret;
TRACE("iface %p, source %p, options %#x, enum_object %p.\n", iface, source, options, enum_object);
TRACE("iface %p, source %p, options %#lx, enum_object %p.\n", iface, source, options, enum_object);
if (!enum_object)
return E_POINTER;
......@@ -593,7 +593,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void *
}
else
{
FIXME("Source type %u is not handled yet\n", options);
FIXME("Source type %lu not handled yet.\n", options);
return E_NOTIMPL;
}
......@@ -669,7 +669,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void *
static HRESULT WINAPI d3dx9_file_CreateSaveObject(ID3DXFile *iface, const void *data,
D3DXF_FILESAVEOPTIONS options, D3DXF_FILEFORMAT format, ID3DXFileSaveObject **save_object)
{
FIXME("iface %p, data %p, options %#x, format %#x, save_object %p stub!\n",
FIXME("iface %p, data %p, options %#lx, format %#lx, save_object %p stub!\n",
iface, data, options, format, save_object);
return E_NOTIMPL;
......@@ -680,12 +680,12 @@ static HRESULT WINAPI d3dx9_file_RegisterTemplates(ID3DXFile *iface, const void
struct d3dx9_file *file = impl_from_ID3DXFile(iface);
HRESULT ret;
TRACE("iface %p, data %p, size %lu.\n", iface, data, size);
TRACE("iface %p, data %p, size %Iu.\n", iface, data, size);
ret = IDirectXFile_RegisterTemplates(file->dxfile, (void *)data, size);
if (ret != DXFILE_OK)
{
WARN("Error %#x\n", ret);
WARN("Error registering templates, hr %#lx.\n", ret);
return error_dxfile_to_d3dxfile(ret);
}
......
dlls/d3dx9_37/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=37
EXTRADEFS = -DD3DX_SDK_VERSION=37
MODULE = d3dx9_37.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_38/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=38
EXTRADEFS = -DD3DX_SDK_VERSION=38
MODULE = d3dx9_38.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_39/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=39
EXTRADEFS = -DD3DX_SDK_VERSION=39
MODULE = d3dx9_39.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_40/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=40
EXTRADEFS = -DD3DX_SDK_VERSION=40
MODULE = d3dx9_40.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_41/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=41
EXTRADEFS = -DD3DX_SDK_VERSION=41
MODULE = d3dx9_41.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_42/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=42
EXTRADEFS = -DD3DX_SDK_VERSION=42
MODULE = d3dx9_42.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
dlls/d3dx9_43/Makefile.in
View file @ 24a4b8ca
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=43
EXTRADEFS = -DD3DX_SDK_VERSION=43
MODULE = d3dx9_43.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
......
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