April 2009 - Wine-commits - list.winehq.org

Jacek Caban : urlmon.idl: Use HANDLE_PTR in IInternetProtocolRoot:: Start declaration.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 19067f12566fccaf540e9e7a06f461dbda0cf0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19067f12566fccaf540e9e7a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 1 03:42:37 2009 +0200 urlmon.idl: Use HANDLE_PTR in IInternetProtocolRoot::Start declaration. --- dlls/itss/protocol.c | 4 ++-- dlls/mshtml/protocol.c | 8 ++++---- dlls/mshtml/tests/htmldoc.c | 4 ++-- dlls/urlmon/bindprot.c | 4 ++-- dlls/urlmon/file.c | 4 ++-- dlls/urlmon/ftp.c | 4 ++-- dlls/urlmon/gopher.c | 4 ++-- dlls/urlmon/http.c | 4 ++-- dlls/urlmon/mk.c | 4 ++-- dlls/urlmon/tests/protocol.c | 4 ++-- dlls/urlmon/tests/url.c | 4 ++-- include/urlmon.idl | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19067f12566fccaf540e9…

1 0

Henri Verbeet : ddraw: Filter invalid texture stage states passed by the application.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 4194d8040f458116ec1b0e91766646471acc5523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4194d8040f458116ec1b0e917… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:00 2009 +0200 ddraw: Filter invalid texture stage states passed by the application. --- dlls/ddraw/device.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 35f3d36..517e7bf 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4776,6 +4776,13 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface, if(!State) return DDERR_INVALIDPARAMS; + if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS) + { + WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType); + *State = 0; + return DD_OK; + } + EnterCriticalSection(&ddraw_cs); if (l->sampler_state) @@ -4896,6 +4903,12 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface, HRESULT hr; TRACE("(%p)->(%08x,%08x,%08x): Relay!\n", This, Stage, TexStageStateType, State); + if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS) + { + WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType); + return DD_OK; + } + EnterCriticalSection(&ddraw_cs); if (l->sampler_state)

1 0

Henri Verbeet : wined3d: Don' t use the opcode_token field in the GLSL backend.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: ec43489e10bde40af70a9bd7ad474b2d6dd26ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec43489e10bde40af70a9bd7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:00 2009 +0200 wined3d: Don't use the opcode_token field in the GLSL backend. The idea is that we want to prevent backends from parsing the tokens themselves, which is pretty much a requirement for adding SM4 support. --- dlls/wined3d/baseshader.c | 3 +++ dlls/wined3d/glsl_shader.c | 20 +++++++++++--------- dlls/wined3d/wined3d_private.h | 2 ++ dlls/wined3d/wined3d_private_types.h | 3 +++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 34ab181..a547949 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -838,6 +838,9 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, hw_arg.opcode = curOpcode; + hw_arg.flags = hw_arg.opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK; + hw_arg.coissue = hw_arg.opcode_token & WINED3DSI_COISSUE; + /* Destination token */ if (curOpcode->dst_token) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c92f99b..9cdab01 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1314,10 +1314,9 @@ void shader_glsl_add_instruction_modifiers(const SHADER_OPCODE_ARG* arg) } } -static inline const char* shader_get_comp_op( - const DWORD opcode) { - - DWORD op = (opcode & INST_CONTROLS_MASK) >> INST_CONTROLS_SHIFT; +static inline const char *shader_get_comp_op(DWORD flags) +{ + DWORD op = (flags & INST_CONTROLS_MASK) >> INST_CONTROLS_SHIFT; switch (op) { case COMPARISON_GT: return ">"; case COMPARISON_EQ: return "=="; @@ -1972,7 +1971,8 @@ static void shader_glsl_cnd(const SHADER_OPCODE_ARG *arg) shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); /* Fun: The D3DSI_COISSUE flag changes the semantic of the cnd instruction for < 1.4 shaders */ - if(arg->opcode_token & WINED3DSI_COISSUE) { + if (arg->coissue) + { shader_addline(arg->buffer, "%s /* COISSUE! */);\n", src1_param.param_str); } else { shader_addline(arg->buffer, "%s > 0.5 ? %s : %s);\n", @@ -2304,7 +2304,7 @@ static void shader_glsl_ifc(const SHADER_OPCODE_ARG *arg) shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, &src1_param); shader_addline(arg->buffer, "if (%s %s %s) {\n", - src0_param.param_str, shader_get_comp_op(arg->opcode_token), src1_param.param_str); + src0_param.param_str, shader_get_comp_op(arg->flags), src1_param.param_str); } static void shader_glsl_else(const SHADER_OPCODE_ARG *arg) @@ -2327,7 +2327,7 @@ static void shader_glsl_breakc(const SHADER_OPCODE_ARG *arg) shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, &src1_param); shader_addline(arg->buffer, "if (%s %s %s) break;\n", - src0_param.param_str, shader_get_comp_op(arg->opcode_token), src1_param.param_str); + src0_param.param_str, shader_get_comp_op(arg->flags), src1_param.param_str); } static void shader_glsl_label(const SHADER_OPCODE_ARG *arg) @@ -2401,7 +2401,8 @@ static void pshader_glsl_tex(const SHADER_OPCODE_ARG *arg) mask = WINED3DSP_WRITEMASK_3; } } else { - if(arg->opcode_token & WINED3DSI_TEXLD_PROJECT) { + if (arg->flags & WINED3DSI_TEXLD_PROJECT) + { /* ps 2.0 texldp instruction always divides by the fourth component. */ sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED; mask = WINED3DSP_WRITEMASK_3; @@ -2430,7 +2431,8 @@ static void pshader_glsl_tex(const SHADER_OPCODE_ARG *arg) } else { glsl_src_param_t coord_param; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], mask, &coord_param); - if(arg->opcode_token & WINED3DSI_TEXLD_BIAS) { + if (arg->flags & WINED3DSI_TEXLD_BIAS) + { glsl_src_param_t bias; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_3, &bias); shader_glsl_gen_sample_code(arg, sampler_idx, &sample_function, swizzle, bias.param_str, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8907b0f..6323250 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2244,6 +2244,8 @@ typedef struct SHADER_OPCODE_ARG { const shader_reg_maps *reg_maps; CONST SHADER_OPCODE* opcode; DWORD opcode_token; + DWORD flags; + BOOL coissue; DWORD dst; DWORD dst_addr; DWORD predicate; diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index e5b4c3d..2d9ae03 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -279,6 +279,9 @@ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { /** opcode-related masks **/ +#define WINED3D_OPCODESPECIFICCONTROL_MASK 0x00ff0000 +#define WINED3D_OPCODESPECIFICCONTROL_SHIFT 16 + #define WINED3DSI_OPCODE_MASK 0x0000FFFF #define WINED3DSI_INSTLENGTH_MASK 0x0F000000 #define WINED3DSI_INSTLENGTH_SHIFT 24

1 0

Henri Verbeet : wined3d: Don' t use the opcode_token field in the ARB backend.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: e44335585e2b058d5b1c8ffdba10682142bbde24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44335585e2b058d5b1c8ffdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:00 2009 +0200 wined3d: Don't use the opcode_token field in the ARB backend. --- dlls/wined3d/arb_program_shader.c | 10 +++------- dlls/wined3d/baseshader.c | 18 ++++++++++-------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1bebb21..ca0671d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -827,7 +827,7 @@ static void pshader_hw_cnd(const SHADER_OPCODE_ARG *arg) pshader_gen_input_modifier_line(arg->shader, buffer, arg->src[2], 2, src_name[2]); /* The coissue flag changes the semantic of the cnd instruction in <= 1.3 shaders */ - if (arg->reg_maps->shader_version <= WINED3DPS_VERSION(1, 3) && arg->opcode_token & WINED3DSI_COISSUE) + if (arg->reg_maps->shader_version <= WINED3DPS_VERSION(1, 3) && arg->coissue) { shader_addline(buffer, "MOV%s %s%s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[1]); } else { @@ -1139,12 +1139,8 @@ static void pshader_hw_tex(const SHADER_OPCODE_ARG *arg) projected = TRUE; } } else { - if(arg->opcode_token & WINED3DSI_TEXLD_PROJECT) { - projected = TRUE; - } - if(arg->opcode_token & WINED3DSI_TEXLD_BIAS) { - bias = TRUE; - } + if (arg->flags & WINED3DSI_TEXLD_PROJECT) projected = TRUE; + if (arg->flags & WINED3DSI_TEXLD_BIAS) bias = TRUE; } shader_hw_sample(arg, reg_sampler_code, reg_dest, reg_coord, projected, bias); } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a547949..65b2709 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -785,6 +785,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, while (WINED3DPS_END() != *pToken) { + DWORD opcode_token; + /* Skip version token */ if (shader_is_version_token(*pToken)) { @@ -801,13 +803,13 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, } /* Read opcode */ - hw_arg.opcode_token = *pToken++; - curOpcode = shader_get_opcode(opcode_table, shader_version, hw_arg.opcode_token); + opcode_token = *pToken++; + curOpcode = shader_get_opcode(opcode_table, shader_version, opcode_token); /* Unknown opcode and its parameters */ if (!curOpcode) { - FIXME("Unrecognized opcode: token=0x%08x\n", hw_arg.opcode_token); + FIXME("Unrecognized opcode: token=0x%08x\n", opcode_token); pToken += shader_skip_unrecognized(pToken, shader_version); continue; } @@ -821,7 +823,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, || WINED3DSIO_PHASE == curOpcode->opcode || WINED3DSIO_RET == curOpcode->opcode) { - pToken += shader_skip_opcode(curOpcode, hw_arg.opcode_token, shader_version); + pToken += shader_skip_opcode(curOpcode, opcode_token, shader_version); continue; } @@ -832,14 +834,14 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, if (!hw_fct) { FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); - pToken += shader_skip_opcode(curOpcode, hw_arg.opcode_token, shader_version); + pToken += shader_skip_opcode(curOpcode, opcode_token, shader_version); continue; } hw_arg.opcode = curOpcode; - hw_arg.flags = hw_arg.opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK; - hw_arg.coissue = hw_arg.opcode_token & WINED3DSI_COISSUE; + hw_arg.flags = opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK; + hw_arg.coissue = opcode_token & WINED3DSI_COISSUE; /* Destination token */ if (curOpcode->dst_token) @@ -851,7 +853,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, } /* Predication token */ - if (hw_arg.opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) hw_arg.predicate = *pToken++; + if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) hw_arg.predicate = *pToken++; /* Other source tokens */ for (i = 0; i < (curOpcode->num_params - curOpcode->dst_token); ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6323250..abd37e9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2243,7 +2243,6 @@ typedef struct SHADER_OPCODE_ARG { IWineD3DBaseShader* shader; const shader_reg_maps *reg_maps; CONST SHADER_OPCODE* opcode; - DWORD opcode_token; DWORD flags; BOOL coissue; DWORD dst;

1 0