Skip to content

W
wine-cw
Commit 3dcd3681 authored by Ivan Gyurdiev's avatar Ivan Gyurdiev Committed by Alexandre Julliard
Browse files
Options

wined3d: Win64 printf fixes.

parent 54d18992
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 185 deletions
dlls/wined3d/Makefile.in
View file @ 3dcd3681
...@@ -7,7 +7,6 @@ IMPORTLIB = libwined3d.$(IMPLIBEXT) ...@@ -7,7 +7,6 @@ IMPORTLIB = libwined3d.$(IMPLIBEXT)
IMPORTS = user32 gdi32 advapi32 kernel32 IMPORTS = user32 gdi32 advapi32 kernel32
EXTRAINCL = @X_CFLAGS@ EXTRAINCL = @X_CFLAGS@
EXTRALIBS = -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ EXTRALIBS = -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ C_SRCS = \
arb_program_shader.c \ arb_program_shader.c \
......
dlls/wined3d/baseshader.c
View file @ 3dcd3681
...@@ -81,7 +81,7 @@ const SHADER_OPCODE* shader_get_opcode( ...@@ -81,7 +81,7 @@ const SHADER_OPCODE* shader_get_opcode(
} }
++i; ++i;
} }
FIXME("Unsupported opcode %#lx(%ld) masked %#lx, shader version %#lx\n", FIXME("Unsupported opcode %#x(%d) masked %#x, shader version %#x\n",
code, code, code & D3DSI_OPCODE_MASK, hex_version); code, code, code & D3DSI_OPCODE_MASK, hex_version);
return NULL; return NULL;
} }
...@@ -144,8 +144,8 @@ int shader_skip_unrecognized( ...@@ -144,8 +144,8 @@ int shader_skip_unrecognized(
tokens_read += shader_get_param(iface, pToken, &param, &addr_token); tokens_read += shader_get_param(iface, pToken, &param, &addr_token);
pToken += tokens_read; pToken += tokens_read;
FIXME("Unrecognized opcode param: token=%08lX " FIXME("Unrecognized opcode param: token=%08x "
"addr_token=%08lX name=", param, addr_token); "addr_token=%08x name=", param, addr_token);
shader_dump_param(iface, param, addr_token, i); shader_dump_param(iface, param, addr_token, i);
FIXME("\n"); FIXME("\n");
++i; ++i;
...@@ -302,7 +302,7 @@ HRESULT shader_get_registers_used( ...@@ -302,7 +302,7 @@ HRESULT shader_get_registers_used(
DWORD sampler_code = *pToken & D3DSP_REGNUM_MASK; DWORD sampler_code = *pToken & D3DSP_REGNUM_MASK;
if(!stateBlock->textures[sampler_code]) { if(!stateBlock->textures[sampler_code]) {
ERR("No texture bound to sampler %ld\n", sampler_code); ERR("No texture bound to sampler %d\n", sampler_code);
reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_2D; reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_2D;
} else { } else {
int texType = IWineD3DBaseTexture_GetTextureDimensions(stateBlock->textures[sampler_code]); int texType = IWineD3DBaseTexture_GetTextureDimensions(stateBlock->textures[sampler_code]);
...@@ -404,7 +404,7 @@ static void shader_dump_decl_usage( ...@@ -404,7 +404,7 @@ static void shader_dump_decl_usage(
case WINED3DSTT_2D: TRACE("_2d"); break; case WINED3DSTT_2D: TRACE("_2d"); break;
case WINED3DSTT_CUBE: TRACE("_cube"); break; case WINED3DSTT_CUBE: TRACE("_cube"); break;
case WINED3DSTT_VOLUME: TRACE("_volume"); break; case WINED3DSTT_VOLUME: TRACE("_volume"); break;
default: TRACE("_unknown_ttype(%08lx)", ttype); default: TRACE("_unknown_ttype(%08x)", ttype);
} }
} else { } else {
...@@ -421,7 +421,7 @@ static void shader_dump_decl_usage( ...@@ -421,7 +421,7 @@ static void shader_dump_decl_usage(
switch(usage) { switch(usage) {
case D3DDECLUSAGE_POSITION: case D3DDECLUSAGE_POSITION:
TRACE("%s%ld", "position", idx); TRACE("%s%d", "position", idx);
break; break;
case D3DDECLUSAGE_BLENDINDICES: case D3DDECLUSAGE_BLENDINDICES:
TRACE("%s", "blend"); TRACE("%s", "blend");
...@@ -430,7 +430,7 @@ static void shader_dump_decl_usage( ...@@ -430,7 +430,7 @@ static void shader_dump_decl_usage(
TRACE("%s", "weight"); TRACE("%s", "weight");
break; break;
case D3DDECLUSAGE_NORMAL: case D3DDECLUSAGE_NORMAL:
TRACE("%s%ld", "normal", idx); TRACE("%s%d", "normal", idx);
break; break;
case D3DDECLUSAGE_PSIZE: case D3DDECLUSAGE_PSIZE:
TRACE("%s", "psize"); TRACE("%s", "psize");
...@@ -439,11 +439,11 @@ static void shader_dump_decl_usage( ...@@ -439,11 +439,11 @@ static void shader_dump_decl_usage(
if(idx == 0) { if(idx == 0) {
TRACE("%s", "color"); TRACE("%s", "color");
} else { } else {
TRACE("%s%ld", "specular", (idx - 1)); TRACE("%s%d", "specular", (idx - 1));
} }
break; break;
case D3DDECLUSAGE_TEXCOORD: case D3DDECLUSAGE_TEXCOORD:
TRACE("%s%ld", "texture", idx); TRACE("%s%d", "texture", idx);
break; break;
case D3DDECLUSAGE_TANGENT: case D3DDECLUSAGE_TANGENT:
TRACE("%s", "tangent"); TRACE("%s", "tangent");
...@@ -455,7 +455,7 @@ static void shader_dump_decl_usage( ...@@ -455,7 +455,7 @@ static void shader_dump_decl_usage(
TRACE("%s", "tessfactor"); TRACE("%s", "tessfactor");
break; break;
case D3DDECLUSAGE_POSITIONT: case D3DDECLUSAGE_POSITIONT:
TRACE("%s%ld", "positionT", idx); TRACE("%s%d", "positionT", idx);
break; break;
case D3DDECLUSAGE_FOG: case D3DDECLUSAGE_FOG:
TRACE("%s", "fog"); TRACE("%s", "fog");
...@@ -467,7 +467,7 @@ static void shader_dump_decl_usage( ...@@ -467,7 +467,7 @@ static void shader_dump_decl_usage(
TRACE("%s", "sample"); TRACE("%s", "sample");
break; break;
default: default:
FIXME("unknown_semantics(%08lx)", usage); FIXME("unknown_semantics(%08x)", usage);
} }
} }
} }
...@@ -538,7 +538,7 @@ void shader_dump_param( ...@@ -538,7 +538,7 @@ void shader_dump_param(
switch (regtype) { switch (regtype) {
case D3DSPR_TEMP: case D3DSPR_TEMP:
TRACE("r%lu", reg); TRACE("r%u", reg);
break; break;
case D3DSPR_INPUT: case D3DSPR_INPUT:
TRACE("v"); TRACE("v");
...@@ -552,19 +552,19 @@ void shader_dump_param( ...@@ -552,19 +552,19 @@ void shader_dump_param(
shader_dump_arr_entry(iface, param, addr_token, shader_get_float_offset(param), input); shader_dump_arr_entry(iface, param, addr_token, shader_get_float_offset(param), input);
break; break;
case D3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */ case D3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */
TRACE("%c%lu", (pshader? 't':'a'), reg); TRACE("%c%u", (pshader? 't':'a'), reg);
break; break;
case D3DSPR_RASTOUT: case D3DSPR_RASTOUT:
TRACE("%s", rastout_reg_names[reg]); TRACE("%s", rastout_reg_names[reg]);
break; break;
case D3DSPR_COLOROUT: case D3DSPR_COLOROUT:
TRACE("oC%lu", reg); TRACE("oC%u", reg);
break; break;
case D3DSPR_DEPTHOUT: case D3DSPR_DEPTHOUT:
TRACE("oDepth"); TRACE("oDepth");
break; break;
case D3DSPR_ATTROUT: case D3DSPR_ATTROUT:
TRACE("oD%lu", reg); TRACE("oD%u", reg);
break; break;
case D3DSPR_TEXCRDOUT: case D3DSPR_TEXCRDOUT:
...@@ -576,7 +576,7 @@ void shader_dump_param( ...@@ -576,7 +576,7 @@ void shader_dump_param(
shader_dump_arr_entry(iface, param, addr_token, reg, input); shader_dump_arr_entry(iface, param, addr_token, reg, input);
} }
else else
TRACE("oT%lu", reg); TRACE("oT%u", reg);
break; break;
case D3DSPR_CONSTINT: case D3DSPR_CONSTINT:
TRACE("i"); TRACE("i");
...@@ -587,19 +587,19 @@ void shader_dump_param( ...@@ -587,19 +587,19 @@ void shader_dump_param(
shader_dump_arr_entry(iface, param, addr_token, reg, input); shader_dump_arr_entry(iface, param, addr_token, reg, input);
break; break;
case D3DSPR_LABEL: case D3DSPR_LABEL:
TRACE("l%lu", reg); TRACE("l%u", reg);
break; break;
case D3DSPR_LOOP: case D3DSPR_LOOP:
TRACE("aL"); TRACE("aL");
break; break;
case D3DSPR_SAMPLER: case D3DSPR_SAMPLER:
TRACE("s%lu", reg); TRACE("s%u", reg);
break; break;
case D3DSPR_PREDICATE: case D3DSPR_PREDICATE:
TRACE("p%lu", reg); TRACE("p%u", reg);
break; break;
default: default:
TRACE("unhandled_rtype(%#lx)", regtype); TRACE("unhandled_rtype(%#x)", regtype);
break; break;
} }
...@@ -639,7 +639,7 @@ void shader_dump_param( ...@@ -639,7 +639,7 @@ void shader_dump_param(
case D3DSPSM_ABSNEG: TRACE(")"); break; case D3DSPSM_ABSNEG: TRACE(")"); break;
case D3DSPSM_ABS: TRACE(")"); break; case D3DSPSM_ABS: TRACE(")"); break;
default: default:
TRACE("_unknown_modifier(%#lx)", modifier >> D3DSP_SRCMOD_SHIFT); TRACE("_unknown_modifier(%#x)", modifier >> D3DSP_SRCMOD_SHIFT);
} }
} }
...@@ -720,7 +720,7 @@ void shader_generate_main( ...@@ -720,7 +720,7 @@ void shader_generate_main(
/* Unknown opcode and its parameters */ /* Unknown opcode and its parameters */
if (NULL == curOpcode) { if (NULL == curOpcode) {
FIXME("Unrecognized opcode: token=%08lX\n", hw_arg.opcode_token); FIXME("Unrecognized opcode: token=%08x\n", hw_arg.opcode_token);
pToken += shader_skip_unrecognized(iface, pToken); pToken += shader_skip_unrecognized(iface, pToken);
/* Nothing to do */ /* Nothing to do */
...@@ -793,7 +793,7 @@ void shader_dump_ins_modifiers(const DWORD output) { ...@@ -793,7 +793,7 @@ void shader_dump_ins_modifiers(const DWORD output) {
case 1: TRACE("_x2"); break; case 1: TRACE("_x2"); break;
case 2: TRACE("_x4"); break; case 2: TRACE("_x4"); break;
case 3: TRACE("_x8"); break; case 3: TRACE("_x8"); break;
default: TRACE("_unhandled_shift(%ld)", shift); break; default: TRACE("_unhandled_shift(%d)", shift); break;
} }
if (mmask & D3DSPDM_SATURATE) TRACE("_sat"); if (mmask & D3DSPDM_SATURATE) TRACE("_sat");
...@@ -802,7 +802,7 @@ void shader_dump_ins_modifiers(const DWORD output) { ...@@ -802,7 +802,7 @@ void shader_dump_ins_modifiers(const DWORD output) {
mmask &= ~(D3DSPDM_SATURATE | D3DSPDM_PARTIALPRECISION | D3DSPDM_MSAMPCENTROID); mmask &= ~(D3DSPDM_SATURATE | D3DSPDM_PARTIALPRECISION | D3DSPDM_MSAMPCENTROID);
if (mmask) if (mmask)
FIXME("_unrecognized_modifier(%#lx)", mmask >> D3DSP_DSTMOD_SHIFT); FIXME("_unrecognized_modifier(%#x)", mmask >> D3DSP_DSTMOD_SHIFT);
} }
/* First pass: trace shader, initialize length and version */ /* First pass: trace shader, initialize length and version */
...@@ -824,7 +824,7 @@ void shader_trace_init( ...@@ -824,7 +824,7 @@ void shader_trace_init(
while (D3DVS_END() != *pToken) { while (D3DVS_END() != *pToken) {
if (shader_is_version_token(*pToken)) { /** version */ if (shader_is_version_token(*pToken)) { /** version */
This->baseShader.hex_version = *pToken; This->baseShader.hex_version = *pToken;
TRACE("%s_%lu_%lu\n", shader_is_pshader_version(This->baseShader.hex_version)? "ps": "vs", TRACE("%s_%u_%u\n", shader_is_pshader_version(This->baseShader.hex_version)? "ps": "vs",
D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version), D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version),
D3DSHADER_VERSION_MINOR(This->baseShader.hex_version)); D3DSHADER_VERSION_MINOR(This->baseShader.hex_version));
++pToken; ++pToken;
...@@ -845,7 +845,7 @@ void shader_trace_init( ...@@ -845,7 +845,7 @@ void shader_trace_init(
if (NULL == curOpcode) { if (NULL == curOpcode) {
int tokens_read; int tokens_read;
FIXME("Unrecognized opcode: token=%08lX\n", opcode_token); FIXME("Unrecognized opcode: token=%08x\n", opcode_token);
tokens_read = shader_skip_unrecognized(iface, pToken); tokens_read = shader_skip_unrecognized(iface, pToken);
pToken += tokens_read; pToken += tokens_read;
len += tokens_read; len += tokens_read;
...@@ -877,18 +877,18 @@ void shader_trace_init( ...@@ -877,18 +877,18 @@ void shader_trace_init(
len += 5; len += 5;
} else if (curOpcode->opcode == D3DSIO_DEFI) { } else if (curOpcode->opcode == D3DSIO_DEFI) {
TRACE("defi i%lu = %ld, %ld, %ld, %ld", *pToken & D3DSP_REGNUM_MASK, TRACE("defi i%u = %d, %d, %d, %d", *pToken & D3DSP_REGNUM_MASK,
(long) *(pToken + 1), *(pToken + 1),
(long) *(pToken + 2), *(pToken + 2),
(long) *(pToken + 3), *(pToken + 3),
(long) *(pToken + 4)); *(pToken + 4));
pToken += 5; pToken += 5;
len += 5; len += 5;
} else if (curOpcode->opcode == D3DSIO_DEFB) { } else if (curOpcode->opcode == D3DSIO_DEFB) {
TRACE("defb b%lu = %s", *pToken & D3DSP_REGNUM_MASK, TRACE("defb b%u = %s", *pToken & D3DSP_REGNUM_MASK,
*(pToken + 1)? "true": "false"); *(pToken + 1)? "true": "false");
pToken += 2; pToken += 2;
...@@ -921,7 +921,7 @@ void shader_trace_init( ...@@ -921,7 +921,7 @@ void shader_trace_init(
case COMPARISON_NE: TRACE("_ne"); break; case COMPARISON_NE: TRACE("_ne"); break;
case COMPARISON_LE: TRACE("_le"); break; case COMPARISON_LE: TRACE("_le"); break;
default: default:
TRACE("_(%lu)", op); TRACE("_(%u)", op);
} }
} }
......
dlls/wined3d/basetexture.c
View file @ 3dcd3681
...@@ -78,14 +78,14 @@ ULONG WINAPI IWineD3DBaseTextureImpl_AddRef(IWineD3DBaseTexture *iface) { ...@@ -78,14 +78,14 @@ ULONG WINAPI IWineD3DBaseTextureImpl_AddRef(IWineD3DBaseTexture *iface) {
IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface;
ULONG ref = InterlockedIncrement(&This->resource.ref); ULONG ref = InterlockedIncrement(&This->resource.ref);
TRACE("(%p) : AddRef increasing from %ld\n", This,ref - 1); TRACE("(%p) : AddRef increasing from %d\n", This,ref - 1);
return ref; return ref;
} }
ULONG WINAPI IWineD3DBaseTextureImpl_Release(IWineD3DBaseTexture *iface) { ULONG WINAPI IWineD3DBaseTextureImpl_Release(IWineD3DBaseTexture *iface) {
IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface;
ULONG ref = InterlockedDecrement(&This->resource.ref); ULONG ref = InterlockedDecrement(&This->resource.ref);
TRACE("(%p) : Releasing from %ld\n", This, ref + 1); TRACE("(%p) : Releasing from %d\n", This, ref + 1);
if (ref == 0) { if (ref == 0) {
IWineD3DBaseTextureImpl_CleanUp(iface); IWineD3DBaseTextureImpl_CleanUp(iface);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -351,14 +351,14 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface ...@@ -351,14 +351,14 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface
for (i = 0 ;textureObjectSamplerStates[i].state != -1; i++) { for (i = 0 ;textureObjectSamplerStates[i].state != -1; i++) {
if (*state != samplerStates[textureObjectSamplerStates[i].state]) { if (*state != samplerStates[textureObjectSamplerStates[i].state]) {
/* apply the state */ /* apply the state */
TRACE("(%p) : Changing state %u from %ld to %ld\n", This, i, *state , samplerStates[textureObjectSamplerStates[i].state]); TRACE("(%p) : Changing state %u from %d to %d\n", This, i, *state , samplerStates[textureObjectSamplerStates[i].state]);
switch (textureObjectSamplerStates[i].function) { switch (textureObjectSamplerStates[i].function) {
case WINED3DSAMP_ADDRESSU: case WINED3DSAMP_ADDRESSU:
case WINED3DSAMP_ADDRESSV: /* fall through */ case WINED3DSAMP_ADDRESSV: /* fall through */
case WINED3DSAMP_ADDRESSW: /* fall through */ case WINED3DSAMP_ADDRESSW: /* fall through */
*state = samplerStates[textureObjectSamplerStates[i].state]; *state = samplerStates[textureObjectSamplerStates[i].state];
if (*state < minLookup[WINELOOKUP_WARPPARAM] || *state > maxLookup[WINELOOKUP_WARPPARAM]) { if (*state < minLookup[WINELOOKUP_WARPPARAM] || *state > maxLookup[WINELOOKUP_WARPPARAM]) {
FIXME("Unrecognized or unsupported D3DTADDRESS_* value %ld, state %d\n", *state, textureObjectSamplerStates[i].function); FIXME("Unrecognized or unsupported D3DTADDRESS_* value %d, state %d\n", *state, textureObjectSamplerStates[i].function);
} else { } else {
GLint wrapParm = stateLookup[WINELOOKUP_WARPPARAM][*state - minLookup[WINELOOKUP_WARPPARAM]]; GLint wrapParm = stateLookup[WINELOOKUP_WARPPARAM][*state - minLookup[WINELOOKUP_WARPPARAM]];
TRACE("Setting WRAP_R to %d for %x\n", wrapParm, textureDimensions); TRACE("Setting WRAP_R to %d for %x\n", wrapParm, textureDimensions);
...@@ -371,7 +371,7 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface ...@@ -371,7 +371,7 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface
float col[4]; float col[4];
*state = samplerStates[textureObjectSamplerStates[i].state]; *state = samplerStates[textureObjectSamplerStates[i].state];
D3DCOLORTOGLFLOAT4(*state, col); D3DCOLORTOGLFLOAT4(*state, col);
TRACE("Setting border color for %u to %lx\n", textureDimensions, *state); TRACE("Setting border color for %u to %x\n", textureDimensions, *state);
glTexParameterfv(textureDimensions, GL_TEXTURE_BORDER_COLOR, &col[0]); glTexParameterfv(textureDimensions, GL_TEXTURE_BORDER_COLOR, &col[0]);
checkGLcall("glTexParameteri(..., GL_TEXTURE_BORDER_COLOR, ...)"); checkGLcall("glTexParameteri(..., GL_TEXTURE_BORDER_COLOR, ...)");
} }
...@@ -381,10 +381,10 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface ...@@ -381,10 +381,10 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface
GLint glValue; GLint glValue;
*state = samplerStates[textureObjectSamplerStates[i].state]; *state = samplerStates[textureObjectSamplerStates[i].state];
if (*state < minLookup[WINELOOKUP_MAGFILTER] || *state > maxLookup[WINELOOKUP_MAGFILTER]) { if (*state < minLookup[WINELOOKUP_MAGFILTER] || *state > maxLookup[WINELOOKUP_MAGFILTER]) {
FIXME("Unrecognized or unsupported MAGFILTER* value %ld, state %d\n", *state, textureObjectSamplerStates[i].function); FIXME("Unrecognized or unsupported MAGFILTER* value %d, state %d\n", *state, textureObjectSamplerStates[i].function);
} }
glValue = stateLookup[WINELOOKUP_MAGFILTER][*state - minLookup[WINELOOKUP_MAGFILTER]]; glValue = stateLookup[WINELOOKUP_MAGFILTER][*state - minLookup[WINELOOKUP_MAGFILTER]];
TRACE("ValueMAG=%ld setting MAGFILTER to %x\n", *state, glValue); TRACE("ValueMAG=%d setting MAGFILTER to %x\n", *state, glValue);
glTexParameteri(textureDimensions, GL_TEXTURE_MAG_FILTER, glValue); glTexParameteri(textureDimensions, GL_TEXTURE_MAG_FILTER, glValue);
/* We need to reset the Aniotropic filtering state when we change the mag filter to WINED3DTEXF_ANISOTROPIC (this seems a bit weird, check the documentataion to see how it should be switched off. */ /* We need to reset the Aniotropic filtering state when we change the mag filter to WINED3DTEXF_ANISOTROPIC (this seems a bit weird, check the documentataion to see how it should be switched off. */
if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC) && WINED3DTEXF_ANISOTROPIC == *state) { if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC) && WINED3DTEXF_ANISOTROPIC == *state) {
...@@ -405,7 +405,7 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface ...@@ -405,7 +405,7 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface
This->baseTexture.states[WINED3DTEXSTA_MIPFILTER] > WINED3DTEXF_LINEAR) This->baseTexture.states[WINED3DTEXSTA_MIPFILTER] > WINED3DTEXF_LINEAR)
{ {
FIXME("Unrecognized or unsupported D3DSAMP_MINFILTER value %ld, state %d D3DSAMP_MIPFILTER value %ld, state %d\n", FIXME("Unrecognized or unsupported D3DSAMP_MINFILTER value %d, state %d D3DSAMP_MIPFILTER value %d, state %d\n",
This->baseTexture.states[WINED3DTEXSTA_MINFILTER], This->baseTexture.states[WINED3DTEXSTA_MINFILTER],
textureObjectSamplerStates[WINED3DTEXSTA_MINFILTER].function, textureObjectSamplerStates[WINED3DTEXSTA_MINFILTER].function,
This->baseTexture.states[WINED3DTEXSTA_MIPFILTER], This->baseTexture.states[WINED3DTEXSTA_MIPFILTER],
...@@ -414,7 +414,7 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface ...@@ -414,7 +414,7 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface
glValue = minMipLookup[min(max(This->baseTexture.states[WINED3DTEXSTA_MINFILTER],WINED3DTEXF_NONE), WINED3DTEXF_ANISOTROPIC)] glValue = minMipLookup[min(max(This->baseTexture.states[WINED3DTEXSTA_MINFILTER],WINED3DTEXF_NONE), WINED3DTEXF_ANISOTROPIC)]
[min(max(This->baseTexture.states[WINED3DTEXSTA_MIPFILTER],WINED3DTEXF_NONE), WINED3DTEXF_LINEAR)]; [min(max(This->baseTexture.states[WINED3DTEXSTA_MIPFILTER],WINED3DTEXF_NONE), WINED3DTEXF_LINEAR)];
TRACE("ValueMIN=%ld, ValueMIP=%ld, setting MINFILTER to %x\n", TRACE("ValueMIN=%d, ValueMIP=%d, setting MINFILTER to %x\n",
This->baseTexture.states[WINED3DTEXSTA_MINFILTER], This->baseTexture.states[WINED3DTEXSTA_MINFILTER],
This->baseTexture.states[WINED3DTEXSTA_MIPFILTER], glValue); This->baseTexture.states[WINED3DTEXSTA_MIPFILTER], glValue);
glTexParameteri(textureDimensions, GL_TEXTURE_MIN_FILTER, glValue); glTexParameteri(textureDimensions, GL_TEXTURE_MIN_FILTER, glValue);
......
dlls/wined3d/cubetexture.c
View file @ 3dcd3681
...@@ -66,14 +66,14 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_QueryInterface(IWineD3DCubeTexture ...@@ -66,14 +66,14 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_QueryInterface(IWineD3DCubeTexture
static ULONG WINAPI IWineD3DCubeTextureImpl_AddRef(IWineD3DCubeTexture *iface) { static ULONG WINAPI IWineD3DCubeTextureImpl_AddRef(IWineD3DCubeTexture *iface) {
IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface;
TRACE("(%p) : AddRef increasing from %ld\n", This, This->resource.ref); TRACE("(%p) : AddRef increasing from %d\n", This, This->resource.ref);
return InterlockedIncrement(&This->resource.ref); return InterlockedIncrement(&This->resource.ref);
} }
static ULONG WINAPI IWineD3DCubeTextureImpl_Release(IWineD3DCubeTexture *iface) { static ULONG WINAPI IWineD3DCubeTextureImpl_Release(IWineD3DCubeTexture *iface) {
IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface;
ULONG ref; ULONG ref;
TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); TRACE("(%p) : Releasing from %d\n", This, This->resource.ref);
ref = InterlockedDecrement(&This->resource.ref); ref = InterlockedDecrement(&This->resource.ref);
if (ref == 0) { if (ref == 0) {
int i,j; int i,j;
...@@ -302,7 +302,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_LockRect(IWineD3DCubeTexture *ifac ...@@ -302,7 +302,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_LockRect(IWineD3DCubeTexture *ifac
} }
if (WINED3D_OK == hr) { if (WINED3D_OK == hr) {
TRACE("(%p) -> faceType(%d) level(%d) returning memory@%p success(%lu)\n", This, FaceType, Level, pLockedRect->pBits, hr); TRACE("(%p) -> faceType(%d) level(%d) returning memory@%p success(%u)\n", This, FaceType, Level, pLockedRect->pBits, hr);
} else { } else {
WARN("(%p) level(%d) overflow Levels(%d) Or FaceType(%d)\n", This, Level, This->baseTexture.levels, FaceType); WARN("(%p) level(%d) overflow Levels(%d) Or FaceType(%d)\n", This, Level, This->baseTexture.levels, FaceType);
} }
...@@ -319,7 +319,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_UnlockRect(IWineD3DCubeTexture *if ...@@ -319,7 +319,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_UnlockRect(IWineD3DCubeTexture *if
} }
if (WINED3D_OK == hr) { if (WINED3D_OK == hr) {
TRACE("(%p) -> faceType(%d) level(%d) success(%lu)\n", This, FaceType, Level, hr); TRACE("(%p) -> faceType(%d) level(%d) success(%u)\n", This, FaceType, Level, hr);
} else { } else {
WARN("(%p) level(%d) overflow Levels(%d) Or FaceType(%d)\n", This, Level, This->baseTexture.levels, FaceType); WARN("(%p) level(%d) overflow Levels(%d) Or FaceType(%d)\n", This, Level, This->baseTexture.levels, FaceType);
} }
......
dlls/wined3d/directx.c
View file @ 3dcd3681
...@@ -182,14 +182,14 @@ static ULONG WINAPI IWineD3DImpl_AddRef(IWineD3D *iface) { ...@@ -182,14 +182,14 @@ static ULONG WINAPI IWineD3DImpl_AddRef(IWineD3D *iface) {
IWineD3DImpl *This = (IWineD3DImpl *)iface; IWineD3DImpl *This = (IWineD3DImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p) : AddRef increasing from %ld\n", This, refCount - 1); TRACE("(%p) : AddRef increasing from %d\n", This, refCount - 1);
return refCount; return refCount;
} }
static ULONG WINAPI IWineD3DImpl_Release(IWineD3D *iface) { static ULONG WINAPI IWineD3DImpl_Release(IWineD3D *iface) {
IWineD3DImpl *This = (IWineD3DImpl *)iface; IWineD3DImpl *This = (IWineD3DImpl *)iface;
ULONG ref; ULONG ref;
TRACE("(%p) : Releasing from %ld\n", This, This->ref); TRACE("(%p) : Releasing from %d\n", This, This->ref);
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
if (ref == 0) { if (ref == 0) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -450,7 +450,7 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { ...@@ -450,7 +450,7 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) {
minor = 9; minor = 9;
} }
gl_info->gl_driver_version = MAKEDWORD_VERSION(major, minor); gl_info->gl_driver_version = MAKEDWORD_VERSION(major, minor);
TRACE_(d3d_caps)("found GL_VERSION (%s)->%i.%i->(0x%08lx)\n", debugstr_a(gl_string), major, minor, gl_info->gl_driver_version); TRACE_(d3d_caps)("found GL_VERSION (%s)->%i.%i->(0x%08x)\n", debugstr_a(gl_string), major, minor, gl_info->gl_driver_version);
} }
TRACE_(d3d_caps)("found GL_RENDERER (%s)->(0x%04x)\n", debugstr_a(gl_info->gl_renderer), gl_info->gl_card); TRACE_(d3d_caps)("found GL_RENDERER (%s)->(0x%04x)\n", debugstr_a(gl_info->gl_renderer), gl_info->gl_card);
...@@ -1259,7 +1259,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad ...@@ -1259,7 +1259,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad
WINED3DADAPTER_IDENTIFIER* pIdentifier) { WINED3DADAPTER_IDENTIFIER* pIdentifier) {
IWineD3DImpl *This = (IWineD3DImpl *)iface; IWineD3DImpl *This = (IWineD3DImpl *)iface;
TRACE_(d3d_caps)("(%p}->(Adapter: %d, Flags: %lx, pId=%p)\n", This, Adapter, Flags, pIdentifier); TRACE_(d3d_caps)("(%p}->(Adapter: %d, Flags: %x, pId=%p)\n", This, Adapter, Flags, pIdentifier);
if (Adapter >= IWineD3D_GetAdapterCount(iface)) { if (Adapter >= IWineD3D_GetAdapterCount(iface)) {
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
...@@ -1508,7 +1508,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDepthStencilMatch(IWineD3D *iface, UINT ...@@ -1508,7 +1508,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDepthStencilMatch(IWineD3D *iface, UINT
if (hr != WINED3D_OK) if (hr != WINED3D_OK)
TRACE_(d3d_caps)("Failed to match stencil format to device\b"); TRACE_(d3d_caps)("Failed to match stencil format to device\b");
TRACE_(d3d_caps)("(%p) : Returning %lx\n", This, hr); TRACE_(d3d_caps)("(%p) : Returning %x\n", This, hr);
return hr; return hr;
} }
...@@ -1587,7 +1587,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter ...@@ -1587,7 +1587,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter
static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType,
WINED3DFORMAT AdapterFormat, DWORD Usage, WINED3DRESOURCETYPE RType, WINED3DFORMAT CheckFormat) { WINED3DFORMAT AdapterFormat, DWORD Usage, WINED3DRESOURCETYPE RType, WINED3DFORMAT CheckFormat) {
IWineD3DImpl *This = (IWineD3DImpl *)iface; IWineD3DImpl *This = (IWineD3DImpl *)iface;
TRACE_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, DevType:(%u,%s), AdptFmt:(%u,%s), Use:(%lu,%s,%s), ResTyp:(%x,%s), CheckFmt:(%u,%s)) ", TRACE_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, DevType:(%u,%s), AdptFmt:(%u,%s), Use:(%u,%s,%s), ResTyp:(%x,%s), CheckFmt:(%u,%s)) ",
This, This,
Adapter, Adapter,
DeviceType, debug_d3ddevicetype(DeviceType), DeviceType, debug_d3ddevicetype(DeviceType),
...@@ -2382,7 +2382,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, ...@@ -2382,7 +2382,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter,
/* Set the state up as invalid until the device is fully created */ /* Set the state up as invalid until the device is fully created */
object->state = WINED3DERR_DRIVERINTERNALERROR; object->state = WINED3DERR_DRIVERINTERNALERROR;
TRACE("(%p)->(Adptr:%d, DevType: %x, FocusHwnd: %p, BehFlags: %lx, RetDevInt: %p)\n", This, Adapter, DeviceType, TRACE("(%p)->(Adptr:%d, DevType: %x, FocusHwnd: %p, BehFlags: %x, RetDevInt: %p)\n", This, Adapter, DeviceType,
hFocusWindow, BehaviourFlags, ppReturnedDeviceInterface); hFocusWindow, BehaviourFlags, ppReturnedDeviceInterface);
/* Save the creation parameters */ /* Save the creation parameters */
......
dlls/wined3d/drawprim.c
View file @ 3dcd3681
...@@ -463,7 +463,7 @@ void primitiveDeclarationConvertToStridedData( ...@@ -463,7 +463,7 @@ void primitiveDeclarationConvertToStridedData(
if (stride_used) { if (stride_used) {
TRACE("Loaded %s array %u [usage=%s, usage_idx=%u, " TRACE("Loaded %s array %u [usage=%s, usage_idx=%u, "
"stream=%u, offset=%u, stride=%lu, VBO=%u]\n", "stream=%u, offset=%u, stride=%u, VBO=%u]\n",
useVertexShaderFunction? "shader": "fixed function", idx, useVertexShaderFunction? "shader": "fixed function", idx,
debug_d3ddeclusage(element->Usage), element->UsageIndex, debug_d3ddeclusage(element->Usage), element->UsageIndex,
element->Stream, element->Offset, stride, streamVBO); element->Stream, element->Offset, stride, streamVBO);
...@@ -882,7 +882,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData ...@@ -882,7 +882,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
checkGLcall("glEnableClientState(GL_WEIGHT_ARRAY_ARB)"); checkGLcall("glEnableClientState(GL_WEIGHT_ARRAY_ARB)");
#endif #endif
TRACE("Blend %d %p %ld\n", WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType), TRACE("Blend %d %p %d\n", WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType),
sd->u.s.blendWeights.lpData, sd->u.s.blendWeights.dwStride); sd->u.s.blendWeights.lpData, sd->u.s.blendWeights.dwStride);
/* FIXME("TODO\n");*/ /* FIXME("TODO\n");*/
/* Note dwType == float3 or float4 == 2 or 3 */ /* Note dwType == float3 or float4 == 2 or 3 */
...@@ -895,7 +895,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData ...@@ -895,7 +895,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
#endif #endif
VTRACE(("glWeightPointerARB(%d, GL_FLOAT, %ld, %p)\n", VTRACE(("glWeightPointerARB(%d, GL_FLOAT, %d, %p)\n",
WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType) , WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType) ,
sd->u.s.blendWeights.dwStride, sd->u.s.blendWeights.dwStride,
sd->u.s.blendWeights.lpData)); sd->u.s.blendWeights.lpData));
...@@ -1026,7 +1026,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData ...@@ -1026,7 +1026,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
/* Vertex Pointers -----------------------------------------*/ /* Vertex Pointers -----------------------------------------*/
if (sd->u.s.position.lpData != NULL || sd->u.s.position.VBO != 0) { if (sd->u.s.position.lpData != NULL || sd->u.s.position.VBO != 0) {
/* Note dwType == float3 or float4 == 2 or 3 */ /* Note dwType == float3 or float4 == 2 or 3 */
VTRACE(("glVertexPointer(%ld, GL_FLOAT, %ld, %p)\n", VTRACE(("glVertexPointer(%d, GL_FLOAT, %d, %p)\n",
sd->u.s.position.dwStride, sd->u.s.position.dwStride,
sd->u.s.position.dwType + 1, sd->u.s.position.dwType + 1,
sd->u.s.position.lpData)); sd->u.s.position.lpData));
...@@ -1067,7 +1067,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData ...@@ -1067,7 +1067,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
/* Normals -------------------------------------------------*/ /* Normals -------------------------------------------------*/
if (sd->u.s.normal.lpData || sd->u.s.normal.VBO) { if (sd->u.s.normal.lpData || sd->u.s.normal.VBO) {
/* Note dwType == float3 or float4 == 2 or 3 */ /* Note dwType == float3 or float4 == 2 or 3 */
VTRACE(("glNormalPointer(GL_FLOAT, %ld, %p)\n", VTRACE(("glNormalPointer(GL_FLOAT, %d, %p)\n",
sd->u.s.normal.dwStride, sd->u.s.normal.dwStride,
sd->u.s.normal.lpData)); sd->u.s.normal.lpData));
if(curVBO != sd->u.s.normal.VBO) { if(curVBO != sd->u.s.normal.VBO) {
...@@ -1101,7 +1101,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData ...@@ -1101,7 +1101,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
if (sd->u.s.diffuse.lpData || sd->u.s.diffuse.VBO) { if (sd->u.s.diffuse.lpData || sd->u.s.diffuse.VBO) {
/* Note dwType == float3 or float4 == 2 or 3 */ /* Note dwType == float3 or float4 == 2 or 3 */
VTRACE(("glColorPointer(4, GL_UNSIGNED_BYTE, %ld, %p)\n", VTRACE(("glColorPointer(4, GL_UNSIGNED_BYTE, %d, %p)\n",
sd->u.s.diffuse.dwStride, sd->u.s.diffuse.dwStride,
sd->u.s.diffuse.lpData)); sd->u.s.diffuse.lpData));
...@@ -1128,7 +1128,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData ...@@ -1128,7 +1128,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
if (sd->u.s.specular.lpData || sd->u.s.specular.VBO) { if (sd->u.s.specular.lpData || sd->u.s.specular.VBO) {
TRACE("setting specular colour\n"); TRACE("setting specular colour\n");
/* Note dwType == float3 or float4 == 2 or 3 */ /* Note dwType == float3 or float4 == 2 or 3 */
VTRACE(("glSecondaryColorPointer(4, GL_UNSIGNED_BYTE, %ld, %p)\n", VTRACE(("glSecondaryColorPointer(4, GL_UNSIGNED_BYTE, %d, %p)\n",
sd->u.s.specular.dwStride, sd->u.s.specular.dwStride,
sd->u.s.specular.lpData)); sd->u.s.specular.lpData));
if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { if (GL_SUPPORT(EXT_SECONDARY_COLOR)) {
...@@ -1227,7 +1227,7 @@ static void drawStridedFast(IWineD3DDevice *iface,UINT numberOfVertices, GLenum ...@@ -1227,7 +1227,7 @@ static void drawStridedFast(IWineD3DDevice *iface,UINT numberOfVertices, GLenum
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
if (idxData != NULL /* This crashes sometimes!*/) { if (idxData != NULL /* This crashes sometimes!*/) {
TRACE("(%p) : glElements(%x, %d, %ld, ...)\n", This, glPrimitiveType, numberOfVertices, minIndex); TRACE("(%p) : glElements(%x, %d, %d, ...)\n", This, glPrimitiveType, numberOfVertices, minIndex);
idxData = idxData == (void *)-1 ? NULL : idxData; idxData = idxData == (void *)-1 ? NULL : idxData;
#if 1 #if 1
#if 0 #if 0
...@@ -1306,10 +1306,10 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData ...@@ -1306,10 +1306,10 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
/* Indexed so work out the number of strides to skip */ /* Indexed so work out the number of strides to skip */
if (idxSize == 2) { if (idxSize == 2) {
VTRACE(("Idx for vertex %ld = %d\n", vx_index, pIdxBufS[startIdx+vx_index])); VTRACE(("Idx for vertex %d = %d\n", vx_index, pIdxBufS[startIdx+vx_index]));
SkipnStrides = pIdxBufS[startIdx + vx_index]; SkipnStrides = pIdxBufS[startIdx + vx_index];
} else { } else {
VTRACE(("Idx for vertex %ld = %ld\n", vx_index, pIdxBufL[startIdx+vx_index])); VTRACE(("Idx for vertex %d = %d\n", vx_index, pIdxBufL[startIdx+vx_index]));
SkipnStrides = pIdxBufL[startIdx + vx_index]; SkipnStrides = pIdxBufL[startIdx + vx_index];
} }
} }
...@@ -1442,7 +1442,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData ...@@ -1442,7 +1442,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
case 4: /* Nop here */ case 4: /* Nop here */
break; break;
default: default:
FIXME("Unexpected D3DTSS_TEXTURETRANSFORMFLAGS value of %ld\n", FIXME("Unexpected D3DTSS_TEXTURETRANSFORMFLAGS value of %d\n",
This->stateBlock->textureState[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] & D3DTTFF_PROJECTED); This->stateBlock->textureState[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] & D3DTTFF_PROJECTED);
} }
} }
...@@ -1628,10 +1628,10 @@ void drawStridedSoftwareVS(IWineD3DDevice *iface, WineDirect3DVertexStridedData ...@@ -1628,10 +1628,10 @@ void drawStridedSoftwareVS(IWineD3DDevice *iface, WineDirect3DVertexStridedData
/* Indexed so work out the number of strides to skip */ /* Indexed so work out the number of strides to skip */
if (idxSize == 2) { if (idxSize == 2) {
VTRACE(("Idx for vertex %ld = %d\n", vx_index, pIdxBufS[startIdx+vx_index])); VTRACE(("Idx for vertex %d = %d\n", vx_index, pIdxBufS[startIdx+vx_index]));
SkipnStrides = pIdxBufS[startIdx+vx_index]; SkipnStrides = pIdxBufS[startIdx+vx_index];
} else { } else {
VTRACE(("Idx for vertex %ld = %ld\n", vx_index, pIdxBufL[startIdx+vx_index])); VTRACE(("Idx for vertex %d = %d\n", vx_index, pIdxBufL[startIdx+vx_index]));
SkipnStrides = pIdxBufL[startIdx+vx_index]; SkipnStrides = pIdxBufL[startIdx+vx_index];
} }
} }
...@@ -2214,7 +2214,7 @@ void drawPrimitive(IWineD3DDevice *iface, ...@@ -2214,7 +2214,7 @@ void drawPrimitive(IWineD3DDevice *iface,
WINED3DLOCKED_RECT r; WINED3DLOCKED_RECT r;
char buffer[80]; char buffer[80];
IWineD3DSurface_LockRect(This->renderTarget, &r, NULL, WINED3DLOCK_READONLY); IWineD3DSurface_LockRect(This->renderTarget, &r, NULL, WINED3DLOCK_READONLY);
sprintf(buffer, "/tmp/backbuffer_%ld.tga", primCounter); sprintf(buffer, "/tmp/backbuffer_%d.tga", primCounter);
TRACE("Saving screenshot %s\n", buffer); TRACE("Saving screenshot %s\n", buffer);
IWineD3DSurface_SaveSnapshot(This->renderTarget, buffer); IWineD3DSurface_SaveSnapshot(This->renderTarget, buffer);
IWineD3DSurface_UnlockRect(This->renderTarget); IWineD3DSurface_UnlockRect(This->renderTarget);
...@@ -2225,7 +2225,7 @@ void drawPrimitive(IWineD3DDevice *iface, ...@@ -2225,7 +2225,7 @@ void drawPrimitive(IWineD3DDevice *iface,
int textureNo; int textureNo;
for (textureNo = 0; textureNo < GL_LIMITS(textures); ++textureNo) { for (textureNo = 0; textureNo < GL_LIMITS(textures); ++textureNo) {
if (This->stateBlock->textures[textureNo] != NULL) { if (This->stateBlock->textures[textureNo] != NULL) {
sprintf(buffer, "/tmp/texture_%p_%ld_%d.tga", This->stateBlock->textures[textureNo], primCounter, textureNo); sprintf(buffer, "/tmp/texture_%p_%d_%d.tga", This->stateBlock->textures[textureNo], primCounter, textureNo);
TRACE("Saving texture %s\n", buffer); TRACE("Saving texture %s\n", buffer);
if (IWineD3DBaseTexture_GetType(This->stateBlock->textures[textureNo]) == WINED3DRTYPE_TEXTURE) { if (IWineD3DBaseTexture_GetType(This->stateBlock->textures[textureNo]) == WINED3DRTYPE_TEXTURE) {
IWineD3DTexture_GetSurfaceLevel((IWineD3DTexture *)This->stateBlock->textures[textureNo], 0, &pSur); IWineD3DTexture_GetSurfaceLevel((IWineD3DTexture *)This->stateBlock->textures[textureNo], 0, &pSur);
...@@ -2239,7 +2239,7 @@ void drawPrimitive(IWineD3DDevice *iface, ...@@ -2239,7 +2239,7 @@ void drawPrimitive(IWineD3DDevice *iface,
} }
#endif #endif
} }
TRACE("drawprim #%ld\n", primCounter); TRACE("drawprim #%d\n", primCounter);
++primCounter; ++primCounter;
} }
#endif #endif
......
dlls/wined3d/indexbuffer.c
View file @ 3dcd3681
...@@ -49,14 +49,14 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_QueryInterface(IWineD3DIndexBuffer ...@@ -49,14 +49,14 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_QueryInterface(IWineD3DIndexBuffer
static ULONG WINAPI IWineD3DIndexBufferImpl_AddRef(IWineD3DIndexBuffer *iface) { static ULONG WINAPI IWineD3DIndexBufferImpl_AddRef(IWineD3DIndexBuffer *iface) {
IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface;
ULONG ref = InterlockedIncrement(&This->resource.ref); ULONG ref = InterlockedIncrement(&This->resource.ref);
TRACE("(%p) : AddRef increasing from %ld\n", This, ref - 1); TRACE("(%p) : AddRef increasing from %d\n", This, ref - 1);
return ref; return ref;
} }
static ULONG WINAPI IWineD3DIndexBufferImpl_Release(IWineD3DIndexBuffer *iface) { static ULONG WINAPI IWineD3DIndexBufferImpl_Release(IWineD3DIndexBuffer *iface) {
IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface;
ULONG ref = InterlockedDecrement(&This->resource.ref); ULONG ref = InterlockedDecrement(&This->resource.ref);
TRACE("(%p) : Releasing from %ld\n", This, ref + 1); TRACE("(%p) : Releasing from %d\n", This, ref + 1);
if (ref == 0) { if (ref == 0) {
IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -108,7 +108,7 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_GetParent(IWineD3DIndexBuffer *ifa ...@@ -108,7 +108,7 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_GetParent(IWineD3DIndexBuffer *ifa
****************************************************** */ ****************************************************** */
static HRESULT WINAPI IWineD3DIndexBufferImpl_Lock(IWineD3DIndexBuffer *iface, UINT OffsetToLock, UINT SizeToLock, BYTE** ppbData, DWORD Flags) { static HRESULT WINAPI IWineD3DIndexBufferImpl_Lock(IWineD3DIndexBuffer *iface, UINT OffsetToLock, UINT SizeToLock, BYTE** ppbData, DWORD Flags) {
IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface;
TRACE("(%p) : no real locking yet, offset %d, size %d, Flags=%lx\n", This, OffsetToLock, SizeToLock, Flags); TRACE("(%p) : no real locking yet, offset %d, size %d, Flags=%x\n", This, OffsetToLock, SizeToLock, Flags);
*ppbData = (BYTE *)This->resource.allocatedMemory + OffsetToLock; *ppbData = (BYTE *)This->resource.allocatedMemory + OffsetToLock;
return WINED3D_OK; return WINED3D_OK;
} }
......
dlls/wined3d/palette.c
View file @ 3dcd3681
...@@ -51,7 +51,7 @@ static ULONG WINAPI IWineD3DPaletteImpl_AddRef(IWineD3DPalette *iface) { ...@@ -51,7 +51,7 @@ static ULONG WINAPI IWineD3DPaletteImpl_AddRef(IWineD3DPalette *iface) {
IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() incrementing from %lu.\n", This, ref - 1); TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
return ref; return ref;
} }
...@@ -60,7 +60,7 @@ static ULONG WINAPI IWineD3DPaletteImpl_Release(IWineD3DPalette *iface) { ...@@ -60,7 +60,7 @@ static ULONG WINAPI IWineD3DPaletteImpl_Release(IWineD3DPalette *iface) {
IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() decrementing from %lu.\n", This, ref + 1); TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
if (!ref) { if (!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -84,7 +84,7 @@ DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) { ...@@ -84,7 +84,7 @@ DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) {
static HRESULT WINAPI IWineD3DPaletteImpl_GetEntries(IWineD3DPalette *iface, DWORD Flags, DWORD Start, DWORD Count, PALETTEENTRY *PalEnt) { static HRESULT WINAPI IWineD3DPaletteImpl_GetEntries(IWineD3DPalette *iface, DWORD Flags, DWORD Start, DWORD Count, PALETTEENTRY *PalEnt) {
IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface;
TRACE("(%p)->(%08lx,%ld,%ld,%p)\n",This,Flags,Start,Count,PalEnt); TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt);
if (Flags != 0) return WINED3DERR_INVALIDCALL; /* unchecked */ if (Flags != 0) return WINED3DERR_INVALIDCALL; /* unchecked */
if (Start + Count > IWineD3DPaletteImpl_Size(This->Flags)) if (Start + Count > IWineD3DPaletteImpl_Size(This->Flags))
...@@ -109,7 +109,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DW ...@@ -109,7 +109,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DW
IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface;
ResourceList *res; ResourceList *res;
TRACE("(%p)->(%08lx,%ld,%ld,%p)\n",This,Flags,Start,Count,PalEnt); TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt);
if (This->Flags & DDPCAPS_8BITENTRIES) { if (This->Flags & DDPCAPS_8BITENTRIES) {
unsigned int i; unsigned int i;
......
dlls/wined3d/pixelshader.c
View file @ 3dcd3681
...@@ -63,14 +63,14 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShade ...@@ -63,14 +63,14 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShade
static ULONG WINAPI IWineD3DPixelShaderImpl_AddRef(IWineD3DPixelShader *iface) { static ULONG WINAPI IWineD3DPixelShaderImpl_AddRef(IWineD3DPixelShader *iface) {
IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface;
TRACE("(%p) : AddRef increasing from %ld\n", This, This->ref); TRACE("(%p) : AddRef increasing from %d\n", This, This->ref);
return InterlockedIncrement(&This->ref); return InterlockedIncrement(&This->ref);
} }
static ULONG WINAPI IWineD3DPixelShaderImpl_Release(IWineD3DPixelShader *iface) { static ULONG WINAPI IWineD3DPixelShaderImpl_Release(IWineD3DPixelShader *iface) {
IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface;
ULONG ref; ULONG ref;
TRACE("(%p) : Releasing from %ld\n", This, This->ref); TRACE("(%p) : Releasing from %d\n", This, This->ref);
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
if (ref == 0) { if (ref == 0) {
if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) {
...@@ -803,7 +803,7 @@ static void pshader_set_limits( ...@@ -803,7 +803,7 @@ static void pshader_set_limits(
This->baseShader.limits.sampler = 16; This->baseShader.limits.sampler = 16;
This->baseShader.limits.packed_input = 0; This->baseShader.limits.packed_input = 0;
This->baseShader.limits.label = 0; This->baseShader.limits.label = 0;
FIXME("Unrecognized pixel shader version %#lx\n", FIXME("Unrecognized pixel shader version %#x\n",
This->baseShader.hex_version); This->baseShader.hex_version);
} }
} }
......
dlls/wined3d/query.c
View file @ 3dcd3681
...@@ -55,14 +55,14 @@ static HRESULT WINAPI IWineD3DQueryImpl_QueryInterface(IWineD3DQuery *iface, RE ...@@ -55,14 +55,14 @@ static HRESULT WINAPI IWineD3DQueryImpl_QueryInterface(IWineD3DQuery *iface, RE
static ULONG WINAPI IWineD3DQueryImpl_AddRef(IWineD3DQuery *iface) { static ULONG WINAPI IWineD3DQueryImpl_AddRef(IWineD3DQuery *iface) {
IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface;
TRACE("(%p) : AddRef increasing from %ld\n", This, This->ref); TRACE("(%p) : AddRef increasing from %d\n", This, This->ref);
return InterlockedIncrement(&This->ref); return InterlockedIncrement(&This->ref);
} }
static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) { static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) {
IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface;
ULONG ref; ULONG ref;
TRACE("(%p) : Releasing from %ld\n", This, This->ref); TRACE("(%p) : Releasing from %d\n", This, This->ref);
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
if (ref == 0) { if (ref == 0) {
HeapFree(GetProcessHeap(), 0, This->extendedData); HeapFree(GetProcessHeap(), 0, This->extendedData);
...@@ -96,7 +96,7 @@ static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pDa ...@@ -96,7 +96,7 @@ static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pDa
IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface;
HRESULT res = S_OK; HRESULT res = S_OK;
TRACE("(%p) : type %#x, pData %p, dwSize %#lx, dwGetDataFlags %#lx\n", This, This->type, pData, dwSize, dwGetDataFlags); TRACE("(%p) : type %#x, pData %p, dwSize %#x, dwGetDataFlags %#x\n", This, This->type, pData, dwSize, dwGetDataFlags);
if(dwSize == 0){ if(dwSize == 0){
/*you can use this method to poll the resource for the query status*/ /*you can use this method to poll the resource for the query status*/
...@@ -334,7 +334,7 @@ static WINED3DQUERYTYPE WINAPI IWineD3DQueryImpl_GetType(IWineD3DQuery* iface){ ...@@ -334,7 +334,7 @@ static WINED3DQUERYTYPE WINAPI IWineD3DQueryImpl_GetType(IWineD3DQuery* iface){
static HRESULT WINAPI IWineD3DQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIssueFlags){ static HRESULT WINAPI IWineD3DQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIssueFlags){
IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface;
TRACE("(%p) : dwIssueFlags %#lx, type %#x\n", This, dwIssueFlags, This->type); TRACE("(%p) : dwIssueFlags %#x, type %#x\n", This, dwIssueFlags, This->type);
switch (This->type) { switch (This->type) {
case WINED3DQUERYTYPE_OCCLUSION: case WINED3DQUERYTYPE_OCCLUSION:
......
dlls/wined3d/resource.c
View file @ 3dcd3681
...@@ -46,14 +46,14 @@ HRESULT WINAPI IWineD3DResourceImpl_QueryInterface(IWineD3DResource *iface, REFI ...@@ -46,14 +46,14 @@ HRESULT WINAPI IWineD3DResourceImpl_QueryInterface(IWineD3DResource *iface, REFI
ULONG WINAPI IWineD3DResourceImpl_AddRef(IWineD3DResource *iface) { ULONG WINAPI IWineD3DResourceImpl_AddRef(IWineD3DResource *iface) {
IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface;
ULONG ref = InterlockedIncrement(&This->resource.ref); ULONG ref = InterlockedIncrement(&This->resource.ref);
TRACE("(%p) : AddRef increasing from %ld\n", This, ref - 1); TRACE("(%p) : AddRef increasing from %d\n", This, ref - 1);
return ref; return ref;
} }
ULONG WINAPI IWineD3DResourceImpl_Release(IWineD3DResource *iface) { ULONG WINAPI IWineD3DResourceImpl_Release(IWineD3DResource *iface) {
IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface;
ULONG ref = InterlockedDecrement(&This->resource.ref); ULONG ref = InterlockedDecrement(&This->resource.ref);
TRACE("(%p) : Releasing from %ld\n", This, ref + 1); TRACE("(%p) : Releasing from %d\n", This, ref + 1);
if (ref == 0) { if (ref == 0) {
IWineD3DResourceImpl_CleanUp(iface); IWineD3DResourceImpl_CleanUp(iface);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -103,7 +103,7 @@ HRESULT WINAPI IWineD3DResourceImpl_SetPrivateData(IWineD3DResource *iface, REFG ...@@ -103,7 +103,7 @@ HRESULT WINAPI IWineD3DResourceImpl_SetPrivateData(IWineD3DResource *iface, REFG
IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface;
PrivateData **data; PrivateData **data;
TRACE("(%p) : %p %p %ld %ld\n", This, refguid, pData, SizeOfData, Flags); TRACE("(%p) : %p %p %d %d\n", This, refguid, pData, SizeOfData, Flags);
data = IWineD3DResourceImpl_FindPrivateData(This, refguid); data = IWineD3DResourceImpl_FindPrivateData(This, refguid);
if (*data == NULL) if (*data == NULL)
{ {
......
dlls/wined3d/stateblock.c
View file @ 3dcd3681
...@@ -217,7 +217,7 @@ static ULONG WINAPI IWineD3DStateBlockImpl_AddRef(IWineD3DStateBlock *iface) { ...@@ -217,7 +217,7 @@ static ULONG WINAPI IWineD3DStateBlockImpl_AddRef(IWineD3DStateBlock *iface) {
IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p) : AddRef increasing from %ld\n", This, refCount - 1); TRACE("(%p) : AddRef increasing from %d\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -225,7 +225,7 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { ...@@ -225,7 +225,7 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) {
IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p) : Releasing from %ld\n", This, refCount + 1); TRACE("(%p) : Releasing from %d\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
constant_entry *constant, *constant2; constant_entry *constant, *constant2;
...@@ -412,7 +412,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) ...@@ -412,7 +412,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface)
/* If the light exists, copy its parameters, otherwise copy the default parameters */ /* If the light exists, copy its parameters, otherwise copy the default parameters */
const WINED3DLIGHT* params = realLight? &realLight->OriginalParms: &WINED3D_default_light; const WINED3DLIGHT* params = realLight? &realLight->OriginalParms: &WINED3D_default_light;
TRACE("Updating lights for light %ld\n", src->OriginalIndex); TRACE("Updating lights for light %d\n", src->OriginalIndex);
memcpy(&src->OriginalParms, params, sizeof(*params)); memcpy(&src->OriginalParms, params, sizeof(*params));
} }
...@@ -420,7 +420,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) ...@@ -420,7 +420,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface)
if (src->enabledChanged) { if (src->enabledChanged) {
/* If the light exists, check if it's enabled, otherwise default is disabled state */ /* If the light exists, check if it's enabled, otherwise default is disabled state */
TRACE("Updating lightEnabled for light %ld\n", src->OriginalIndex); TRACE("Updating lightEnabled for light %d\n", src->OriginalIndex);
src->lightEnabled = realLight? realLight->lightEnabled: FALSE; src->lightEnabled = realLight? realLight->lightEnabled: FALSE;
} }
...@@ -567,7 +567,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) ...@@ -567,7 +567,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface)
for (i = 1; i <= WINEHIGHEST_RENDER_STATE; i++) { for (i = 1; i <= WINEHIGHEST_RENDER_STATE; i++) {
if (This->set.renderState[i] && (This->renderState[i] != targetStateBlock->renderState[i])) { if (This->set.renderState[i] && (This->renderState[i] != targetStateBlock->renderState[i])) {
TRACE("Updating renderState %d to %ld\n", i, targetStateBlock->renderState[i]); TRACE("Updating renderState %d to %d\n", i, targetStateBlock->renderState[i]);
This->renderState[i] = targetStateBlock->renderState[i]; This->renderState[i] = targetStateBlock->renderState[i];
} }
} }
...@@ -577,7 +577,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) ...@@ -577,7 +577,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface)
/* TODO: move over to using memcpy */ /* TODO: move over to using memcpy */
for (i = 1; i <= WINED3D_HIGHEST_TEXTURE_STATE ; i++) { for (i = 1; i <= WINED3D_HIGHEST_TEXTURE_STATE ; i++) {
if (This->set.textureState[j][i]) { if (This->set.textureState[j][i]) {
TRACE("Updating texturestagestate %d,%d to %ld (was %ld)\n", j,i, targetStateBlock->textureState[j][i], TRACE("Updating texturestagestate %d,%d to %d (was %d)\n", j,i, targetStateBlock->textureState[j][i],
This->textureState[j][i]); This->textureState[j][i]);
This->textureState[j][i] = targetStateBlock->textureState[j][i]; This->textureState[j][i] = targetStateBlock->textureState[j][i];
} }
...@@ -593,7 +593,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) ...@@ -593,7 +593,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface)
} }
for (i = 1; i <= WINED3D_HIGHEST_SAMPLER_STATE ; i++){ /* States are 1 based */ for (i = 1; i <= WINED3D_HIGHEST_SAMPLER_STATE ; i++){ /* States are 1 based */
if (This->set.samplerState[j][i]) { if (This->set.samplerState[j][i]) {
TRACE("Updating sampler state %d,%d to %ld (was %ld)\n", TRACE("Updating sampler state %d,%d to %d (was %d)\n",
j, i, targetStateBlock->samplerState[j][i], j, i, targetStateBlock->samplerState[j][i],
This->samplerState[j][i]); This->samplerState[j][i]);
This->samplerState[j][i] = targetStateBlock->samplerState[j][i]; This->samplerState[j][i] = targetStateBlock->samplerState[j][i];
......
dlls/wined3d/surface_gdi.c
View file @ 3dcd3681
...@@ -65,7 +65,7 @@ x11_copy_to_screen(IWineD3DSurfaceImpl *This, ...@@ -65,7 +65,7 @@ x11_copy_to_screen(IWineD3DSurfaceImpl *This,
hDisplayDC = GetDCEx(hDisplayWnd, 0, DCX_CLIPSIBLINGS|DCX_CACHE); hDisplayDC = GetDCEx(hDisplayWnd, 0, DCX_CLIPSIBLINGS|DCX_CACHE);
if(rc) if(rc)
{ {
TRACE(" copying rect (%ld,%ld)->(%ld,%ld), offset (%ld,%ld)\n", TRACE(" copying rect (%d,%d)->(%d,%d), offset (%d,%d)\n",
rc->left, rc->top, rc->right, rc->bottom, offset.x, offset.y); rc->left, rc->top, rc->right, rc->bottom, offset.x, offset.y);
} }
#if 0 #if 0
...@@ -175,7 +175,7 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface, ...@@ -175,7 +175,7 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface,
TRACE("Warning: trying to lock unlockable surf@%p\n", This); TRACE("Warning: trying to lock unlockable surf@%p\n", This);
} }
TRACE("(%p) : rect@%p flags(%08lx), output lockedRect@%p, memory@%p\n", TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n",
This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); This, pRect, Flags, pLockedRect, This->resource.allocatedMemory);
if(!This->resource.allocatedMemory) { if(!This->resource.allocatedMemory) {
...@@ -200,13 +200,13 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface, ...@@ -200,13 +200,13 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface,
This->lockedRect.right = This->currentDesc.Width; This->lockedRect.right = This->currentDesc.Width;
This->lockedRect.bottom = This->currentDesc.Height; This->lockedRect.bottom = This->currentDesc.Height;
TRACE("Locked Rect (%p) = l %ld, t %ld, r %ld, b %ld\n", TRACE("Locked Rect (%p) = l %d, t %d, r %d, b %d\n",
&This->lockedRect, This->lockedRect.left, This->lockedRect.top, &This->lockedRect, This->lockedRect.left, This->lockedRect.top,
This->lockedRect.right, This->lockedRect.bottom); This->lockedRect.right, This->lockedRect.bottom);
} }
else else
{ {
TRACE("Lock Rect (%p) = l %ld, t %ld, r %ld, b %ld\n", TRACE("Lock Rect (%p) = l %d, t %d, r %d, b %d\n",
pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); pRect, pRect->left, pRect->top, pRect->right, pRect->bottom);
if ((pRect->top < 0) || if ((pRect->top < 0) ||
...@@ -322,7 +322,7 @@ IWineGDISurfaceImpl_Flip(IWineD3DSurface *iface, ...@@ -322,7 +322,7 @@ IWineGDISurfaceImpl_Flip(IWineD3DSurface *iface,
{ {
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
IWineD3DSurfaceImpl *Target = (IWineD3DSurfaceImpl *) override; IWineD3DSurfaceImpl *Target = (IWineD3DSurfaceImpl *) override;
TRACE("(%p)->(%p,%lx)\n", This, override, Flags); TRACE("(%p)->(%p,%x)\n", This, override, Flags);
TRACE("(%p) Flipping to surface %p\n", This, Target); TRACE("(%p) Flipping to surface %p\n", This, Target);
...@@ -503,13 +503,13 @@ IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface, ...@@ -503,13 +503,13 @@ IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface,
int x, y; int x, y;
const PixelFormatDesc *sEntry, *dEntry; const PixelFormatDesc *sEntry, *dEntry;
LPBYTE dbuf, sbuf; LPBYTE dbuf, sbuf;
TRACE("(%p)->(%p,%p,%p,%lx,%p)\n", This, DestRect, Src, SrcRect, Flags, DDBltFx); TRACE("(%p)->(%p,%p,%p,%x,%p)\n", This, DestRect, Src, SrcRect, Flags, DDBltFx);
if (TRACE_ON(d3d_surface)) if (TRACE_ON(d3d_surface))
{ {
if (DestRect) TRACE("\tdestrect :%ldx%ld-%ldx%ld\n", if (DestRect) TRACE("\tdestrect :%dx%d-%dx%d\n",
DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); DestRect->left, DestRect->top, DestRect->right, DestRect->bottom);
if (SrcRect) TRACE("\tsrcrect :%ldx%ld-%ldx%ld\n", if (SrcRect) TRACE("\tsrcrect :%dx%d-%dx%d\n",
SrcRect->left, SrcRect->top, SrcRect->right, SrcRect->bottom); SrcRect->left, SrcRect->top, SrcRect->right, SrcRect->bottom);
#if 0 #if 0
TRACE("\tflags: "); TRACE("\tflags: ");
...@@ -778,14 +778,14 @@ IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface, ...@@ -778,14 +778,14 @@ IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface,
case SRCCOPY: /* well, we do that below ? */ case SRCCOPY: /* well, we do that below ? */
break; break;
default: default:
FIXME("Unsupported raster op: %08lx Pattern: %p\n", DDBltFx->dwROP, DDBltFx->u5.lpDDSPattern); FIXME("Unsupported raster op: %08x Pattern: %p\n", DDBltFx->dwROP, DDBltFx->u5.lpDDSPattern);
goto error; goto error;
} }
Flags &= ~DDBLT_ROP; Flags &= ~DDBLT_ROP;
} }
if (Flags & DDBLT_DDROPS) if (Flags & DDBLT_DDROPS)
{ {
FIXME("\tDdraw Raster Ops: %08lx Pattern: %p\n", DDBltFx->dwDDROP, DDBltFx->u5.lpDDSPattern); FIXME("\tDdraw Raster Ops: %08x Pattern: %p\n", DDBltFx->dwDDROP, DDBltFx->u5.lpDDSPattern);
} }
/* Now the 'with source' blits */ /* Now the 'with source' blits */
if (Src) if (Src)
...@@ -1085,7 +1085,7 @@ IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface, ...@@ -1085,7 +1085,7 @@ IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface,
error: error:
if (Flags && FIXME_ON(d3d_surface)) if (Flags && FIXME_ON(d3d_surface))
{ {
FIXME("\tUnsupported flags: %08lx\n", Flags); FIXME("\tUnsupported flags: %08x\n", Flags);
} }
release: release:
...@@ -1133,11 +1133,11 @@ IWineGDISurfaceImpl_BltFast(IWineD3DSurface *iface, ...@@ -1133,11 +1133,11 @@ IWineGDISurfaceImpl_BltFast(IWineD3DSurface *iface,
if (TRACE_ON(d3d_surface)) if (TRACE_ON(d3d_surface))
{ {
TRACE("(%p)->(%ld,%ld,%p,%p,%08lx)\n", This,dstx,dsty,Src,rsrc,trans); TRACE("(%p)->(%d,%d,%p,%p,%08x)\n", This,dstx,dsty,Src,rsrc,trans);
if (rsrc) if (rsrc)
{ {
TRACE("\tsrcrect: %ldx%ld-%ldx%ld\n",rsrc->left,rsrc->top, TRACE("\tsrcrect: %dx%d-%dx%d\n",rsrc->left,rsrc->top,
rsrc->right,rsrc->bottom); rsrc->right,rsrc->bottom);
} }
else else
...@@ -1533,13 +1533,13 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface) ...@@ -1533,13 +1533,13 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface)
hr = IWineD3DSurface_GetDC(iface, &hdc); hr = IWineD3DSurface_GetDC(iface, &hdc);
if(FAILED(hr)) if(FAILED(hr))
{ {
ERR("(%p) IWineD3DSurface::GetDC failed with hr %08lx\n", This, hr); ERR("(%p) IWineD3DSurface::GetDC failed with hr %08x\n", This, hr);
return hr; return hr;
} }
hr = IWineD3DSurface_ReleaseDC(iface, hdc); hr = IWineD3DSurface_ReleaseDC(iface, hdc);
if(FAILED(hr)) if(FAILED(hr))
{ {
ERR("(%p) IWineD3DSurface::ReleaseDC failed with hr %08lx\n", This, hr); ERR("(%p) IWineD3DSurface::ReleaseDC failed with hr %08x\n", This, hr);
return hr; return hr;
} }
......
dlls/wined3d/swapchain.c
View file @ 3dcd3681
...@@ -58,7 +58,7 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); ...@@ -58,7 +58,7 @@ WINE_DECLARE_DEBUG_CHANNEL(fps);
static ULONG WINAPI IWineD3DSwapChainImpl_AddRef(IWineD3DSwapChain *iface) { static ULONG WINAPI IWineD3DSwapChainImpl_AddRef(IWineD3DSwapChain *iface) {
IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
DWORD refCount = InterlockedIncrement(&This->ref); DWORD refCount = InterlockedIncrement(&This->ref);
TRACE("(%p) : AddRef increasing from %ld\n", This, refCount - 1); TRACE("(%p) : AddRef increasing from %d\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -86,7 +86,7 @@ static ULONG WINAPI IWineD3DSwapChainImpl_Release(IWineD3DSwapChain *iface) { ...@@ -86,7 +86,7 @@ static ULONG WINAPI IWineD3DSwapChainImpl_Release(IWineD3DSwapChain *iface) {
IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
DWORD refCount; DWORD refCount;
refCount = InterlockedDecrement(&This->ref); refCount = InterlockedDecrement(&This->ref);
TRACE("(%p) : ReleaseRef to %ld\n", This, refCount); TRACE("(%p) : ReleaseRef to %d\n", This, refCount);
if (refCount == 0) { if (refCount == 0) {
IUnknown* bufferParent; IUnknown* bufferParent;
...@@ -554,7 +554,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *ifac ...@@ -554,7 +554,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *ifac
IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
HDC hDC; HDC hDC;
TRACE("(%p) : pRamp@%p flags(%ld)\n", This, pRamp, Flags); TRACE("(%p) : pRamp@%p flags(%d)\n", This, pRamp, Flags);
hDC = GetDC(This->win_handle); hDC = GetDC(This->win_handle);
SetDeviceGammaRamp(hDC, (LPVOID)pRamp); SetDeviceGammaRamp(hDC, (LPVOID)pRamp);
ReleaseDC(This->win_handle, hDC); ReleaseDC(This->win_handle, hDC);
......
dlls/wined3d/texture.c
View file @ 3dcd3681
...@@ -48,14 +48,14 @@ static HRESULT WINAPI IWineD3DTextureImpl_QueryInterface(IWineD3DTexture *iface, ...@@ -48,14 +48,14 @@ static HRESULT WINAPI IWineD3DTextureImpl_QueryInterface(IWineD3DTexture *iface,
static ULONG WINAPI IWineD3DTextureImpl_AddRef(IWineD3DTexture *iface) { static ULONG WINAPI IWineD3DTextureImpl_AddRef(IWineD3DTexture *iface) {
IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface;
TRACE("(%p) : AddRef increasing from %ld\n", This, This->resource.ref); TRACE("(%p) : AddRef increasing from %d\n", This, This->resource.ref);
return InterlockedIncrement(&This->resource.ref); return InterlockedIncrement(&This->resource.ref);
} }
static ULONG WINAPI IWineD3DTextureImpl_Release(IWineD3DTexture *iface) { static ULONG WINAPI IWineD3DTextureImpl_Release(IWineD3DTexture *iface) {
IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface;
ULONG ref; ULONG ref;
TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); TRACE("(%p) : Releasing from %d\n", This, This->resource.ref);
ref = InterlockedDecrement(&This->resource.ref); ref = InterlockedDecrement(&This->resource.ref);
if (ref == 0) { if (ref == 0) {
int i; int i;
......
dlls/wined3d/utils.c
View file @ 3dcd3681
...@@ -246,7 +246,7 @@ const char* debug_d3dusage(DWORD usage) { ...@@ -246,7 +246,7 @@ const char* debug_d3dusage(DWORD usage) {
#undef WINED3DUSAGE_TO_STR #undef WINED3DUSAGE_TO_STR
case 0: return "none"; case 0: return "none";
default: default:
FIXME("Unrecognized %lu Usage!\n", usage); FIXME("Unrecognized %u Usage!\n", usage);
return "unrecognized"; return "unrecognized";
} }
} }
...@@ -264,7 +264,7 @@ const char* debug_d3dusagequery(DWORD usagequery) { ...@@ -264,7 +264,7 @@ const char* debug_d3dusagequery(DWORD usagequery) {
#undef WINED3DUSAGEQUERY_TO_STR #undef WINED3DUSAGEQUERY_TO_STR
case 0: return "none"; case 0: return "none";
default: default:
FIXME("Unrecognized %lu Usage Query!\n", usagequery); FIXME("Unrecognized %u Usage Query!\n", usagequery);
return "unrecognized"; return "unrecognized";
} }
} }
...@@ -511,7 +511,7 @@ const char* debug_d3drenderstate(DWORD state) { ...@@ -511,7 +511,7 @@ const char* debug_d3drenderstate(DWORD state) {
D3DSTATE_TO_STR(WINED3DRS_BLENDOPALPHA ); D3DSTATE_TO_STR(WINED3DRS_BLENDOPALPHA );
#undef D3DSTATE_TO_STR #undef D3DSTATE_TO_STR
default: default:
FIXME("Unrecognized %lu render state!\n", state); FIXME("Unrecognized %u render state!\n", state);
return "unrecognized"; return "unrecognized";
} }
} }
...@@ -534,7 +534,7 @@ const char* debug_d3dsamplerstate(DWORD state) { ...@@ -534,7 +534,7 @@ const char* debug_d3dsamplerstate(DWORD state) {
D3DSTATE_TO_STR(WINED3DSAMP_DMAPOFFSET ); D3DSTATE_TO_STR(WINED3DSAMP_DMAPOFFSET );
#undef D3DSTATE_TO_STR #undef D3DSTATE_TO_STR
default: default:
FIXME("Unrecognized %lu sampler state!\n", state); FIXME("Unrecognized %u sampler state!\n", state);
return "unrecognized"; return "unrecognized";
} }
} }
...@@ -567,7 +567,7 @@ const char* debug_d3dtexturestate(DWORD state) { ...@@ -567,7 +567,7 @@ const char* debug_d3dtexturestate(DWORD state) {
return "unused"; return "unused";
break; break;
default: default:
FIXME("Unrecognized %lu texture state!\n", state); FIXME("Unrecognized %u texture state!\n", state);
return "unrecognized"; return "unrecognized";
} }
} }
...@@ -660,7 +660,7 @@ GLenum StencilOp(DWORD op) { ...@@ -660,7 +660,7 @@ GLenum StencilOp(DWORD op) {
case D3DSTENCILOP_INCR : return GL_INCR_WRAP_EXT; case D3DSTENCILOP_INCR : return GL_INCR_WRAP_EXT;
case D3DSTENCILOP_DECR : return GL_DECR_WRAP_EXT; case D3DSTENCILOP_DECR : return GL_DECR_WRAP_EXT;
default: default:
FIXME("Unrecognized stencil op %ld\n", op); FIXME("Unrecognized stencil op %d\n", op);
return GL_KEEP; return GL_KEEP;
} }
} }
...@@ -676,7 +676,7 @@ GLenum CompareFunc(DWORD func) { ...@@ -676,7 +676,7 @@ GLenum CompareFunc(DWORD func) {
case D3DCMP_GREATEREQUAL : return GL_GEQUAL; case D3DCMP_GREATEREQUAL : return GL_GEQUAL;
case D3DCMP_ALWAYS : return GL_ALWAYS; case D3DCMP_ALWAYS : return GL_ALWAYS;
default: default:
FIXME("Unrecognized D3DCMPFUNC value %ld\n", func); FIXME("Unrecognized D3DCMPFUNC value %d\n", func);
return 0; return 0;
} }
} }
...@@ -711,7 +711,7 @@ static GLenum d3dta_to_combiner_input(DWORD d3dta, DWORD stage, INT texture_idx) ...@@ -711,7 +711,7 @@ static GLenum d3dta_to_combiner_input(DWORD d3dta, DWORD stage, INT texture_idx)
return GL_CONSTANT_COLOR1_NV; return GL_CONSTANT_COLOR1_NV;
default: default:
FIXME("Unrecognized texture arg %#lx\n", d3dta); FIXME("Unrecognized texture arg %#x\n", d3dta);
return GL_TEXTURE; return GL_TEXTURE;
} }
} }
...@@ -761,7 +761,7 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, D3DTEXTURE ...@@ -761,7 +761,7 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, D3DTEXTURE
GLenum portion = is_alpha ? GL_ALPHA : GL_RGB; GLenum portion = is_alpha ? GL_ALPHA : GL_RGB;
GLenum target = GL_COMBINER0_NV + stage; GLenum target = GL_COMBINER0_NV + stage;
TRACE("stage %d, is_alpha %d, op %s, arg1 %#lx, arg2 %#lx, arg3 %#lx, texture_idx %d\n", TRACE("stage %d, is_alpha %d, op %s, arg1 %#x, arg2 %#x, arg3 %#x, texture_idx %d\n",
stage, is_alpha, debug_d3dtop(op), arg1, arg2, arg3, texture_idx); stage, is_alpha, debug_d3dtop(op), arg1, arg2, arg3, texture_idx);
/* If a texture stage references an invalid texture unit the stage just /* If a texture stage references an invalid texture unit the stage just
...@@ -1044,7 +1044,7 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, D3DTEXTURE ...@@ -1044,7 +1044,7 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, D3DTEXTURE
break; break;
default: default:
FIXME("Unhandled D3DTOP: stage %d, is_alpha %d, op %s (%#x), arg1 %#lx, arg2 %#lx, arg3 %#lx, texture_idx %d\n", FIXME("Unhandled D3DTOP: stage %d, is_alpha %d, op %s (%#x), arg1 %#x, arg2 %#x, arg3 %#x, texture_idx %d\n",
stage, is_alpha, debug_d3dtop(op), op, arg1, arg2, arg3, texture_idx); stage, is_alpha, debug_d3dtop(op), op, arg1, arg2, arg3, texture_idx);
} }
...@@ -1085,7 +1085,7 @@ static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* op ...@@ -1085,7 +1085,7 @@ static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* op
*source = GL_TEXTURE; *source = GL_TEXTURE;
break; break;
default: default:
FIXME("Unrecognized texture arg %#lx\n", arg); FIXME("Unrecognized texture arg %#x\n", arg);
*source = GL_TEXTURE; *source = GL_TEXTURE;
break; break;
} }
...@@ -1126,7 +1126,7 @@ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, D3DTEXTUREOP op, ...@@ -1126,7 +1126,7 @@ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, D3DTEXTUREOP op,
BOOL Handled = FALSE; BOOL Handled = FALSE;
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
TRACE("Alpha?(%d), Stage:%d Op(%s), a1(%ld), a2(%ld), a3(%ld)\n", isAlpha, Stage, debug_d3dtop(op), arg1, arg2, arg3); TRACE("Alpha?(%d), Stage:%d Op(%s), a1(%d), a2(%d), a3(%d)\n", isAlpha, Stage, debug_d3dtop(op), arg1, arg2, arg3);
ENTER_GL(); ENTER_GL();
...@@ -2523,7 +2523,7 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4] ...@@ -2523,7 +2523,7 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]
int y1 = Rect->top, y2 = Rect->bottom; int y1 = Rect->top, y2 = Rect->bottom;
GLint maxSize = GL_LIMITS(texture_size); GLint maxSize = GL_LIMITS(texture_size);
TRACE("(%p)->(%ld,%ld)-(%ld,%ld)\n", This, TRACE("(%p)->(%d,%d)-(%d,%d)\n", This,
Rect->left, Rect->top, Rect->right, Rect->bottom); Rect->left, Rect->top, Rect->right, Rect->bottom);
/* The sizes might be reversed */ /* The sizes might be reversed */
...@@ -2608,7 +2608,7 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4] ...@@ -2608,7 +2608,7 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]
This->glRect.top = 0; This->glRect.top = 0;
This->glRect.bottom = This->pow2Height; This->glRect.bottom = This->pow2Height;
} }
TRACE("(%p): Using rect (%ld,%ld)-(%ld,%ld)\n", This, TRACE("(%p): Using rect (%d,%d)-(%d,%d)\n", This,
This->glRect.left, This->glRect.top, This->glRect.right, This->glRect.bottom); This->glRect.left, This->glRect.top, This->glRect.right, This->glRect.bottom);
} }
......
dlls/wined3d/vertexbuffer.c
View file @ 3dcd3681
...@@ -51,14 +51,14 @@ static HRESULT WINAPI IWineD3DVertexBufferImpl_QueryInterface(IWineD3DVertexBuff ...@@ -51,14 +51,14 @@ static HRESULT WINAPI IWineD3DVertexBufferImpl_QueryInterface(IWineD3DVertexBuff
static ULONG WINAPI IWineD3DVertexBufferImpl_AddRef(IWineD3DVertexBuffer *iface) { static ULONG WINAPI IWineD3DVertexBufferImpl_AddRef(IWineD3DVertexBuffer *iface) {
IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface;
ULONG ref = InterlockedIncrement(&This->resource.ref); ULONG ref = InterlockedIncrement(&This->resource.ref);
TRACE("(%p) : AddRef increasing from %ld\n", This, ref - 1); TRACE("(%p) : AddRef increasing from %d\n", This, ref - 1);
return ref; return ref;
} }
static ULONG WINAPI IWineD3DVertexBufferImpl_Release(IWineD3DVertexBuffer *iface) { static ULONG WINAPI IWineD3DVertexBufferImpl_Release(IWineD3DVertexBuffer *iface) {
IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface;
ULONG ref = InterlockedDecrement(&This->resource.ref); ULONG ref = InterlockedDecrement(&This->resource.ref);
TRACE("(%p) : Releasing from %ld\n", This, ref + 1); TRACE("(%p) : Releasing from %d\n", This, ref + 1);
if (ref == 0) { if (ref == 0) {
if(This->vbo) { if(This->vbo) {
...@@ -423,7 +423,7 @@ static HRESULT WINAPI IWineD3DVertexBufferImpl_GetParent(IWineD3DVertexBuffer *i ...@@ -423,7 +423,7 @@ static HRESULT WINAPI IWineD3DVertexBufferImpl_GetParent(IWineD3DVertexBuffer *i
static HRESULT WINAPI IWineD3DVertexBufferImpl_Lock(IWineD3DVertexBuffer *iface, UINT OffsetToLock, UINT SizeToLock, BYTE** ppbData, DWORD Flags) { static HRESULT WINAPI IWineD3DVertexBufferImpl_Lock(IWineD3DVertexBuffer *iface, UINT OffsetToLock, UINT SizeToLock, BYTE** ppbData, DWORD Flags) {
IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface;
BYTE *data; BYTE *data;
TRACE("(%p)->%d, %d, %p, %08lx\n", This, OffsetToLock, SizeToLock, ppbData, Flags); TRACE("(%p)->%d, %d, %p, %08x\n", This, OffsetToLock, SizeToLock, ppbData, Flags);
InterlockedIncrement(&This->lockcount); InterlockedIncrement(&This->lockcount);
......
dlls/wined3d/vertexdeclaration.c
View file @ 3dcd3681
...@@ -186,34 +186,34 @@ static DWORD IWineD3DVertexDeclarationImpl_ParseToken8(const DWORD* pToken) { ...@@ -186,34 +186,34 @@ static DWORD IWineD3DVertexDeclarationImpl_ParseToken8(const DWORD* pToken) {
switch ((token & D3DVSD_TOKENTYPEMASK) >> D3DVSD_TOKENTYPESHIFT) { /* maybe a macro to inverse ... */ switch ((token & D3DVSD_TOKENTYPEMASK) >> D3DVSD_TOKENTYPESHIFT) { /* maybe a macro to inverse ... */
case D3DVSD_TOKEN_NOP: case D3DVSD_TOKEN_NOP:
TRACE(" 0x%08lx NOP()\n", token); TRACE(" 0x%08x NOP()\n", token);
break; break;
case D3DVSD_TOKEN_STREAM: case D3DVSD_TOKEN_STREAM:
if (token & D3DVSD_STREAMTESSMASK) { if (token & D3DVSD_STREAMTESSMASK) {
TRACE(" 0x%08lx STREAM_TESS()\n", token); TRACE(" 0x%08x STREAM_TESS()\n", token);
} else { } else {
TRACE(" 0x%08lx STREAM(%lu)\n", token, ((token & D3DVSD_STREAMNUMBERMASK) >> D3DVSD_STREAMNUMBERSHIFT)); TRACE(" 0x%08x STREAM(%u)\n", token, ((token & D3DVSD_STREAMNUMBERMASK) >> D3DVSD_STREAMNUMBERSHIFT));
} }
break; break;
case D3DVSD_TOKEN_STREAMDATA: case D3DVSD_TOKEN_STREAMDATA:
if (token & 0x10000000) { if (token & 0x10000000) {
TRACE(" 0x%08lx SKIP(%lu)\n", token, ((token & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); TRACE(" 0x%08x SKIP(%u)\n", token, ((token & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT));
} else { } else {
DWORD type = ((token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT); DWORD type = ((token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT);
DWORD reg = ((token & D3DVSD_VERTEXREGMASK) >> D3DVSD_VERTEXREGSHIFT); DWORD reg = ((token & D3DVSD_VERTEXREGMASK) >> D3DVSD_VERTEXREGSHIFT);
TRACE(" 0x%08lx REG(%s, %s)\n", token, VertexDecl8_Registers[reg], VertexDecl8_DataTypes[type]); TRACE(" 0x%08x REG(%s, %s)\n", token, VertexDecl8_Registers[reg], VertexDecl8_DataTypes[type]);
} }
break; break;
case D3DVSD_TOKEN_TESSELLATOR: case D3DVSD_TOKEN_TESSELLATOR:
if (token & 0x10000000) { if (token & 0x10000000) {
DWORD type = ((token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT); DWORD type = ((token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT);
DWORD reg = ((token & D3DVSD_VERTEXREGMASK) >> D3DVSD_VERTEXREGSHIFT); DWORD reg = ((token & D3DVSD_VERTEXREGMASK) >> D3DVSD_VERTEXREGSHIFT);
TRACE(" 0x%08lx TESSUV(%s) as %s\n", token, VertexDecl8_Registers[reg], VertexDecl8_DataTypes[type]); TRACE(" 0x%08x TESSUV(%s) as %s\n", token, VertexDecl8_Registers[reg], VertexDecl8_DataTypes[type]);
} else { } else {
DWORD type = ((token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT); DWORD type = ((token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT);
DWORD regout = ((token & D3DVSD_VERTEXREGMASK) >> D3DVSD_VERTEXREGSHIFT); DWORD regout = ((token & D3DVSD_VERTEXREGMASK) >> D3DVSD_VERTEXREGSHIFT);
DWORD regin = ((token & D3DVSD_VERTEXREGINMASK) >> D3DVSD_VERTEXREGINSHIFT); DWORD regin = ((token & D3DVSD_VERTEXREGINMASK) >> D3DVSD_VERTEXREGINSHIFT);
TRACE(" 0x%08lx TESSNORMAL(%s, %s) as %s\n", token, VertexDecl8_Registers[regin], VertexDecl8_Registers[regout], VertexDecl8_DataTypes[type]); TRACE(" 0x%08x TESSNORMAL(%s, %s) as %s\n", token, VertexDecl8_Registers[regin], VertexDecl8_Registers[regout], VertexDecl8_DataTypes[type]);
} }
break; break;
case D3DVSD_TOKEN_CONSTMEM: case D3DVSD_TOKEN_CONSTMEM:
...@@ -226,16 +226,16 @@ static DWORD IWineD3DVertexDeclarationImpl_ParseToken8(const DWORD* pToken) { ...@@ -226,16 +226,16 @@ static DWORD IWineD3DVertexDeclarationImpl_ParseToken8(const DWORD* pToken) {
{ {
DWORD count = ((token & D3DVSD_CONSTCOUNTMASK) >> D3DVSD_CONSTCOUNTSHIFT); DWORD count = ((token & D3DVSD_CONSTCOUNTMASK) >> D3DVSD_CONSTCOUNTSHIFT);
DWORD extinfo = ((token & D3DVSD_EXTINFOMASK) >> D3DVSD_EXTINFOSHIFT); DWORD extinfo = ((token & D3DVSD_EXTINFOMASK) >> D3DVSD_EXTINFOSHIFT);
TRACE(" 0x%08lx EXT(%lu, %lu)\n", token, count, extinfo); TRACE(" 0x%08x EXT(%u, %u)\n", token, count, extinfo);
/* todo ... print extension */ /* todo ... print extension */
tokenlen = count + 1; tokenlen = count + 1;
} }
break; break;
case D3DVSD_TOKEN_END: case D3DVSD_TOKEN_END:
TRACE(" 0x%08lx END()\n", token); TRACE(" 0x%08x END()\n", token);
break; break;
default: default:
TRACE(" 0x%08lx UNKNOWN\n", token); TRACE(" 0x%08x UNKNOWN\n", token);
/* argg error */ /* argg error */
} }
return tokenlen; return tokenlen;
...@@ -308,12 +308,12 @@ IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; ...@@ -308,12 +308,12 @@ IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface;
convToW[nTokens].Type = type; convToW[nTokens].Type = type;
convToW[nTokens].Offset = offset; convToW[nTokens].Offset = offset;
convToW[nTokens].Reg = reg; convToW[nTokens].Reg = reg;
TRACE("Adding element %ld:\n", nTokens); TRACE("Adding element %d:\n", nTokens);
dump_wined3dvertexelement(&convToW[nTokens]); dump_wined3dvertexelement(&convToW[nTokens]);
offset += glTypeLookup[type].size * glTypeLookup[type].typesize; offset += glTypeLookup[type].size * glTypeLookup[type].typesize;
++nTokens; ++nTokens;
} else if (D3DVSD_TOKEN_STREAMDATA == tokentype && 0x10000000 & tokentype ) { } else if (D3DVSD_TOKEN_STREAMDATA == tokentype && 0x10000000 & tokentype ) {
TRACE(" 0x%08lx SKIP(%lu)\n", tokentype, ((tokentype & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); TRACE(" 0x%08x SKIP(%u)\n", tokentype, ((tokentype & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT));
offset += sizeof(DWORD) * ((tokentype & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); offset += sizeof(DWORD) * ((tokentype & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT);
} else if (D3DVSD_TOKEN_CONSTMEM == tokentype) { } else if (D3DVSD_TOKEN_CONSTMEM == tokentype) {
DWORD i; DWORD i;
...@@ -323,9 +323,9 @@ IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; ...@@ -323,9 +323,9 @@ IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface;
This->constants = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->constants = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
((IWineD3DImpl*)This->wineD3DDevice->wineD3D)->gl_info.max_vshader_constantsF * 4 * sizeof(float)); ((IWineD3DImpl*)This->wineD3DDevice->wineD3D)->gl_info.max_vshader_constantsF * 4 * sizeof(float));
} }
TRACE(" 0x%08lx CONST(%lu, %lu)\n", token, constaddress, count); TRACE(" 0x%08x CONST(%u, %u)\n", token, constaddress, count);
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
TRACE(" c[%lu] = (0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx)\n", TRACE(" c[%u] = (0x%08x, 0x%08x, 0x%08x, 0x%08x)\n",
constaddress, constaddress,
*pToken, *pToken,
*(pToken + 1), *(pToken + 1),
...@@ -336,7 +336,7 @@ IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; ...@@ -336,7 +336,7 @@ IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface;
This->constants[constaddress * 4 + 1] = *(const float *)(pToken + i * 4 + 2); This->constants[constaddress * 4 + 1] = *(const float *)(pToken + i * 4 + 2);
This->constants[constaddress * 4 + 2] = *(const float *)(pToken + i * 4 + 3); This->constants[constaddress * 4 + 2] = *(const float *)(pToken + i * 4 + 3);
This->constants[constaddress * 4 + 3] = *(const float *)(pToken + i * 4 + 4); This->constants[constaddress * 4 + 3] = *(const float *)(pToken + i * 4 + 4);
FIXME(" c[%lu] = (%8f, %8f, %8f, %8f)\n", FIXME(" c[%u] = (%8f, %8f, %8f, %8f)\n",
constaddress, constaddress,
*(const float*) (pToken+ i * 4 + 1), *(const float*) (pToken+ i * 4 + 1),
*(const float*) (pToken + i * 4 + 2), *(const float*) (pToken + i * 4 + 2),
...@@ -427,14 +427,14 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_QueryInterface(IWineD3DVerte ...@@ -427,14 +427,14 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_QueryInterface(IWineD3DVerte
static ULONG WINAPI IWineD3DVertexDeclarationImpl_AddRef(IWineD3DVertexDeclaration *iface) { static ULONG WINAPI IWineD3DVertexDeclarationImpl_AddRef(IWineD3DVertexDeclaration *iface) {
IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface;
TRACE("(%p) : AddRef increasing from %ld\n", This, This->ref); TRACE("(%p) : AddRef increasing from %d\n", This, This->ref);
return InterlockedIncrement(&This->ref); return InterlockedIncrement(&This->ref);
} }
static ULONG WINAPI IWineD3DVertexDeclarationImpl_Release(IWineD3DVertexDeclaration *iface) { static ULONG WINAPI IWineD3DVertexDeclarationImpl_Release(IWineD3DVertexDeclaration *iface) {
IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface;
ULONG ref; ULONG ref;
TRACE("(%p) : Releasing from %ld\n", This, This->ref); TRACE("(%p) : Releasing from %d\n", This, This->ref);
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
if (ref == 0) { if (ref == 0) {
HeapFree(GetProcessHeap(), 0, This->pDeclaration8); HeapFree(GetProcessHeap(), 0, This->pDeclaration8);
...@@ -486,7 +486,7 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration8(IWineD3DVert ...@@ -486,7 +486,7 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration8(IWineD3DVert
} }
if (*pSizeOfData < This->declaration8Length) { if (*pSizeOfData < This->declaration8Length) {
FIXME("(%p) : Returning WINED3DERR_MOREDATA numElements %ld expected %ld\n", iface, *pSizeOfData, This->declaration8Length); FIXME("(%p) : Returning WINED3DERR_MOREDATA numElements %d expected %d\n", iface, *pSizeOfData, This->declaration8Length);
*pSizeOfData = This->declaration8Length; *pSizeOfData = This->declaration8Length;
return WINED3DERR_MOREDATA; return WINED3DERR_MOREDATA;
} }
......
dlls/wined3d/vertexshader.c
View file @ 3dcd3681
...@@ -606,7 +606,7 @@ static void vshader_set_limits( ...@@ -606,7 +606,7 @@ static void vshader_set_limits(
This->baseShader.limits.packed_output = 0; This->baseShader.limits.packed_output = 0;
This->baseShader.limits.sampler = 0; This->baseShader.limits.sampler = 0;
This->baseShader.limits.label = 16; This->baseShader.limits.label = 16;
FIXME("Unrecognized vertex shader version %#lx\n", FIXME("Unrecognized vertex shader version %#x\n",
This->baseShader.hex_version); This->baseShader.hex_version);
} }
} }
...@@ -905,7 +905,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ExecuteSW(IWineD3DVertexShader* iface, W ...@@ -905,7 +905,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ExecuteSW(IWineD3DVertexShader* iface, W
curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, opcode_token); curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, opcode_token);
if (NULL == curOpcode) { if (NULL == curOpcode) {
FIXME("Unrecognized opcode: token=%08lX\n", opcode_token); FIXME("Unrecognized opcode: token=%08x\n", opcode_token);
pToken += shader_skip_unrecognized((IWineD3DBaseShader*) This, pToken); pToken += shader_skip_unrecognized((IWineD3DBaseShader*) This, pToken);
/* return FALSE; */ /* return FALSE; */
...@@ -1097,14 +1097,14 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_QueryInterface(IWineD3DVertexShad ...@@ -1097,14 +1097,14 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_QueryInterface(IWineD3DVertexShad
static ULONG WINAPI IWineD3DVertexShaderImpl_AddRef(IWineD3DVertexShader *iface) { static ULONG WINAPI IWineD3DVertexShaderImpl_AddRef(IWineD3DVertexShader *iface) {
IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface;
TRACE("(%p) : AddRef increasing from %ld\n", This, This->ref); TRACE("(%p) : AddRef increasing from %d\n", This, This->ref);
return InterlockedIncrement(&This->ref); return InterlockedIncrement(&This->ref);
} }
static ULONG WINAPI IWineD3DVertexShaderImpl_Release(IWineD3DVertexShader *iface) { static ULONG WINAPI IWineD3DVertexShaderImpl_Release(IWineD3DVertexShader *iface) {
IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface;
ULONG ref; ULONG ref;
TRACE("(%p) : Releasing from %ld\n", This, This->ref); TRACE("(%p) : Releasing from %d\n", This, This->ref);
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
if (ref == 0) { if (ref == 0) {
if (This->vertexDeclaration) IWineD3DVertexDeclaration_Release(This->vertexDeclaration); if (This->vertexDeclaration) IWineD3DVertexDeclaration_Release(This->vertexDeclaration);
......
dlls/wined3d/volume.c
View file @ 3dcd3681
...@@ -46,14 +46,14 @@ static HRESULT WINAPI IWineD3DVolumeImpl_QueryInterface(IWineD3DVolume *iface, R ...@@ -46,14 +46,14 @@ static HRESULT WINAPI IWineD3DVolumeImpl_QueryInterface(IWineD3DVolume *iface, R
static ULONG WINAPI IWineD3DVolumeImpl_AddRef(IWineD3DVolume *iface) { static ULONG WINAPI IWineD3DVolumeImpl_AddRef(IWineD3DVolume *iface) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
TRACE("(%p) : AddRef increasing from %ld\n", This, This->resource.ref); TRACE("(%p) : AddRef increasing from %d\n", This, This->resource.ref);
return InterlockedIncrement(&This->resource.ref); return InterlockedIncrement(&This->resource.ref);
} }
static ULONG WINAPI IWineD3DVolumeImpl_Release(IWineD3DVolume *iface) { static ULONG WINAPI IWineD3DVolumeImpl_Release(IWineD3DVolume *iface) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
ULONG ref; ULONG ref;
TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); TRACE("(%p) : Releasing from %d\n", This, This->resource.ref);
ref = InterlockedDecrement(&This->resource.ref); ref = InterlockedDecrement(&This->resource.ref);
if (ref == 0) { if (ref == 0) {
IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface);
......
dlls/wined3d/volumetexture.c
View file @ 3dcd3681
...@@ -48,7 +48,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DVolumeTex ...@@ -48,7 +48,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DVolumeTex
static ULONG WINAPI IWineD3DVolumeTextureImpl_AddRef(IWineD3DVolumeTexture *iface) { static ULONG WINAPI IWineD3DVolumeTextureImpl_AddRef(IWineD3DVolumeTexture *iface) {
IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;
TRACE("(%p) : AddRef increasing from %ld\n", This, This->resource.ref); TRACE("(%p) : AddRef increasing from %d\n", This, This->resource.ref);
return InterlockedIncrement(&This->resource.ref); return InterlockedIncrement(&This->resource.ref);
} }
...@@ -56,7 +56,7 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DVolumeTexture *ifa ...@@ -56,7 +56,7 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DVolumeTexture *ifa
IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;
ULONG ref; ULONG ref;
int i; int i;
TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); TRACE("(%p) : Releasing from %d\n", This, This->resource.ref);
ref = InterlockedDecrement(&This->resource.ref); ref = InterlockedDecrement(&This->resource.ref);
if (ref == 0) { if (ref == 0) {
for (i = 0; i < This->baseTexture.levels; i++) { for (i = 0; i < This->baseTexture.levels; i++) {
...@@ -236,7 +236,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_LockBox(IWineD3DVolumeTexture *i ...@@ -236,7 +236,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_LockBox(IWineD3DVolumeTexture *i
if (Level < This->baseTexture.levels) { if (Level < This->baseTexture.levels) {
hr = IWineD3DVolume_LockBox((IWineD3DVolume *)This->volumes[Level], pLockedVolume, pBox, Flags); hr = IWineD3DVolume_LockBox((IWineD3DVolume *)This->volumes[Level], pLockedVolume, pBox, Flags);
TRACE("(%p) Level (%d) success(%lu)\n", This, Level, hr); TRACE("(%p) Level (%d) success(%u)\n", This, Level, hr);
} else { } else {
FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels);
...@@ -251,7 +251,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_UnlockBox(IWineD3DVolumeTexture ...@@ -251,7 +251,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_UnlockBox(IWineD3DVolumeTexture
if (Level < This->baseTexture.levels) { if (Level < This->baseTexture.levels) {
hr = IWineD3DVolume_UnlockBox((IWineD3DVolume*) This->volumes[Level]); hr = IWineD3DVolume_UnlockBox((IWineD3DVolume*) This->volumes[Level]);
TRACE("(%p) -> level(%d) success(%lu)\n", This, Level, hr); TRACE("(%p) -> level(%d) success(%u)\n", This, Level, hr);
} else { } else {
FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels);
......
dlls/wined3d/wined3d_main.c
View file @ 3dcd3681
...@@ -97,7 +97,7 @@ inline static DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, c ...@@ -97,7 +97,7 @@ inline static DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, c
/* At process attach */ /* At process attach */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
{ {
TRACE("WineD3D DLLMain Reason=%ld\n", fdwReason); TRACE("WineD3D DLLMain Reason=%d\n", fdwReason);
if (fdwReason == DLL_PROCESS_ATTACH) if (fdwReason == DLL_PROCESS_ATTACH)
{ {
HMODULE mod; HMODULE mod;
......
dlls/wined3d/wined3d_private.h
View file @ 3dcd3681
...@@ -266,7 +266,7 @@ do { ...@@ -266,7 +266,7 @@ do {
/* Trace vector and strided data information */ /* Trace vector and strided data information */
#define TRACE_VECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w); #define TRACE_VECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w);
#define TRACE_STRIDED(sd,name) TRACE( #name "=(data:%p, stride:%ld, type:%ld)\n", sd->u.s.name.lpData, sd->u.s.name.dwStride, sd->u.s.name.dwType); #define TRACE_STRIDED(sd,name) TRACE( #name "=(data:%p, stride:%d, type:%d)\n", sd->u.s.name.lpData, sd->u.s.name.dwStride, sd->u.s.name.dwType);
/* Defines used for optimizations */ /* Defines used for optimizations */
......
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