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

Stefan Doesinger : wined3d: Use flags instead of bools to control shader_hw_sample.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 2f6a71380517cff7b7ff930821cde9708ce18dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f6a71380517cff7b7ff93082… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Thu May 28 18:16:44 2009 +0200 wined3d: Use flags instead of bools to control shader_hw_sample. --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++++++++++++--------------- 1 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1994ce2..30b48ee 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -895,8 +895,13 @@ static void gen_color_correction(SHADER_BUFFER *buffer, const char *reg, DWORD d } } +#define TEX_PROJ 0x1 +#define TEX_BIAS 0x2 +#define TEX_LOD 0x4 +#define TEX_DERIV 0x10 + static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD sampler_idx, - const char *dst_str, const char *coord_reg, BOOL projected, BOOL bias) + const char *dst_str, const char *coord_reg, WORD flags) { SHADER_BUFFER *buffer = ins->ctx->buffer; DWORD sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; @@ -939,14 +944,19 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD tex_type = ""; } - if (bias) { + if (flags & TEX_BIAS) + { /* Shouldn't be possible, but let's check for it */ - if(projected) FIXME("Biased and Projected texture sampling\n"); + if(flags & TEX_PROJ) FIXME("Biased and Projected texture sampling\n"); /* TXB takes the 4th component of the source vector automatically, as d3d. Nothing more to do */ shader_addline(buffer, "TXB %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); - } else if (projected) { + } + else if (flags & TEX_PROJ) + { shader_addline(buffer, "TXP %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); - } else { + } + else + { shader_addline(buffer, "TEX %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); } @@ -1368,12 +1378,12 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_dst_param *dst = &ins->dst[0]; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); - BOOL projected = FALSE, bias = FALSE; struct wined3d_shader_src_param src; char reg_dest[40]; char reg_coord[40]; DWORD reg_sampler_code; + DWORD myflags = 0; /* All versions have a destination register */ shader_arb_get_dst_param(ins, dst, reg_dest); @@ -1409,7 +1419,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) flags = deviceImpl->stateBlock->textureState[reg_sampler_code][WINED3DTSS_TEXTURETRANSFORMFLAGS]; } if (flags & WINED3DTTFF_PROJECTED) { - projected = TRUE; + myflags |= TEX_PROJ; } } else if (shader_version < WINED3D_SHADER_VERSION(2,0)) @@ -1421,15 +1431,15 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) */ shader_addline(ins->ctx->buffer, "SWZ TA, %s, x, y, z, z;\n", reg_coord); strcpy(reg_coord, "TA"); - projected = TRUE; + myflags |= TEX_PROJ; } else if(src_mod == WINED3DSPSM_DW) { - projected = TRUE; + myflags |= TEX_PROJ; } } else { - if (ins->flags & WINED3DSI_TEXLD_PROJECT) projected = TRUE; - if (ins->flags & WINED3DSI_TEXLD_BIAS) bias = TRUE; + if (ins->flags & WINED3DSI_TEXLD_PROJECT) myflags |= TEX_PROJ; + if (ins->flags & WINED3DSI_TEXLD_BIAS) myflags |= TEX_BIAS; } - shader_hw_sample(ins, reg_sampler_code, reg_dest, reg_coord, projected, bias); + shader_hw_sample(ins, reg_sampler_code, reg_dest, reg_coord, myflags); } static void pshader_hw_texcoord(const struct wined3d_shader_instruction *ins) @@ -1473,7 +1483,7 @@ static void pshader_hw_texreg2ar(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MOV TA.y, %s.x;\n", src_str); shader_addline(buffer, "MOV TA.x, %s.w;\n", src_str); flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg1, dst_str, "TA", flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg1, dst_str, "TA", flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0); } static void pshader_hw_texreg2gb(const struct wined3d_shader_instruction *ins) @@ -1489,7 +1499,7 @@ static void pshader_hw_texreg2gb(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, src_str); shader_addline(buffer, "MOV TA.x, %s.y;\n", src_str); shader_addline(buffer, "MOV TA.y, %s.z;\n", src_str); - shader_hw_sample(ins, reg1, dst_str, "TA", FALSE, FALSE); + shader_hw_sample(ins, reg1, dst_str, "TA", 0); } static void pshader_hw_texreg2rgb(const struct wined3d_shader_instruction *ins) @@ -1501,7 +1511,7 @@ static void pshader_hw_texreg2rgb(const struct wined3d_shader_instruction *ins) /* Note that texreg2rg treats Tx as a temporary register, not as a varying */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src_str); - shader_hw_sample(ins, reg1, dst_str, src_str, FALSE, FALSE); + shader_hw_sample(ins, reg1, dst_str, src_str, 0); } static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) @@ -1547,7 +1557,7 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "ADD TA.xy, TA, %s;\n", reg_coord); } - shader_hw_sample(ins, reg_dest_code, dst_reg, "TA", FALSE, FALSE); + shader_hw_sample(ins, reg_dest_code, dst_reg, "TA", 0); if (ins->handler_idx == WINED3DSIH_TEXBEML) { @@ -1594,7 +1604,7 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 %s.y, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0); } static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) @@ -1639,7 +1649,7 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0); current_state->current_row = 0; } @@ -1681,7 +1691,7 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0); current_state->current_row = 0; } @@ -1723,7 +1733,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0); current_state->current_row = 0; } @@ -1770,7 +1780,7 @@ static void pshader_hw_texdp3tex(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "DP3 TB.x, fragment.texcoord[%u], %s;\n", sampler_idx, src0); shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); - shader_hw_sample(ins, sampler_idx, dst_str, "TB", FALSE /* Only one coord, can't be projected */, FALSE); + shader_hw_sample(ins, sampler_idx, dst_str, "TB", 0 /* Only one coord, can't be projected */); } /** Process the WINED3DSIO_TEXDP3 instruction in ARB:

1 0

Stefan Doesinger : wined3d: Implement texldd in ARB.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 4830a29101302bcbc896462d27b2d77bfa6ec8ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4830a29101302bcbc896462d2… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Fri May 29 17:23:35 2009 +0200 wined3d: Implement texldd in ARB. --- dlls/wined3d/arb_program_shader.c | 53 +++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 30b48ee..3bb603b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -901,7 +901,7 @@ static void gen_color_correction(SHADER_BUFFER *buffer, const char *reg, DWORD d #define TEX_DERIV 0x10 static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD sampler_idx, - const char *dst_str, const char *coord_reg, WORD flags) + const char *dst_str, const char *coord_reg, WORD flags, const char *dsx, const char *dsy) { SHADER_BUFFER *buffer = ins->ctx->buffer; DWORD sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; @@ -944,7 +944,14 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD tex_type = ""; } - if (flags & TEX_BIAS) + if (flags & TEX_DERIV) + { + if(flags & TEX_PROJ) FIXME("Projected texture sampling with custom derivates\n"); + if(flags & TEX_BIAS) FIXME("Biased texture sampling with custom derivates\n"); + shader_addline(buffer, "TXD %s, %s, %s, %s, texture[%u], %s;\n", dst_str, coord_reg, dsx, dsy, + sampler_idx, tex_type); + } + else if (flags & TEX_BIAS) { /* Shouldn't be possible, but let's check for it */ if(flags & TEX_PROJ) FIXME("Biased and Projected texture sampling\n"); @@ -1439,7 +1446,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) if (ins->flags & WINED3DSI_TEXLD_PROJECT) myflags |= TEX_PROJ; if (ins->flags & WINED3DSI_TEXLD_BIAS) myflags |= TEX_BIAS; } - shader_hw_sample(ins, reg_sampler_code, reg_dest, reg_coord, myflags); + shader_hw_sample(ins, reg_sampler_code, reg_dest, reg_coord, myflags, NULL, NULL); } static void pshader_hw_texcoord(const struct wined3d_shader_instruction *ins) @@ -1483,7 +1490,7 @@ static void pshader_hw_texreg2ar(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MOV TA.y, %s.x;\n", src_str); shader_addline(buffer, "MOV TA.x, %s.w;\n", src_str); flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg1, dst_str, "TA", flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0); + shader_hw_sample(ins, reg1, dst_str, "TA", flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); } static void pshader_hw_texreg2gb(const struct wined3d_shader_instruction *ins) @@ -1499,7 +1506,7 @@ static void pshader_hw_texreg2gb(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, src_str); shader_addline(buffer, "MOV TA.x, %s.y;\n", src_str); shader_addline(buffer, "MOV TA.y, %s.z;\n", src_str); - shader_hw_sample(ins, reg1, dst_str, "TA", 0); + shader_hw_sample(ins, reg1, dst_str, "TA", 0, NULL, NULL); } static void pshader_hw_texreg2rgb(const struct wined3d_shader_instruction *ins) @@ -1511,7 +1518,7 @@ static void pshader_hw_texreg2rgb(const struct wined3d_shader_instruction *ins) /* Note that texreg2rg treats Tx as a temporary register, not as a varying */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src_str); - shader_hw_sample(ins, reg1, dst_str, src_str, 0); + shader_hw_sample(ins, reg1, dst_str, src_str, 0, NULL, NULL); } static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) @@ -1557,7 +1564,7 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "ADD TA.xy, TA, %s;\n", reg_coord); } - shader_hw_sample(ins, reg_dest_code, dst_reg, "TA", 0); + shader_hw_sample(ins, reg_dest_code, dst_reg, "TA", 0, NULL, NULL); if (ins->handler_idx == WINED3DSIH_TEXBEML) { @@ -1604,7 +1611,7 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 %s.y, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); } static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) @@ -1649,7 +1656,7 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0); + shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); current_state->current_row = 0; } @@ -1691,7 +1698,7 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); current_state->current_row = 0; } @@ -1733,7 +1740,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); current_state->current_row = 0; } @@ -1780,7 +1787,7 @@ static void pshader_hw_texdp3tex(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "DP3 TB.x, fragment.texcoord[%u], %s;\n", sampler_idx, src0); shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); - shader_hw_sample(ins, sampler_idx, dst_str, "TB", 0 /* Only one coord, can't be projected */); + shader_hw_sample(ins, sampler_idx, dst_str, "TB", 0 /* Only one coord, can't be projected */, NULL, NULL); } /** Process the WINED3DSIO_TEXDP3 instruction in ARB: @@ -2374,6 +2381,24 @@ static void shader_hw_endif(const struct wined3d_shader_instruction *ins) } } +static void shader_hw_texldd(const struct wined3d_shader_instruction *ins) +{ + DWORD sampler_idx = ins->src[1].reg.idx; + char reg_dest[40]; + char reg_src[3][40]; + DWORD flags = TEX_DERIV; + + shader_arb_get_dst_param(ins, &ins->dst[0], reg_dest); + shader_arb_get_src_param(ins, &ins->src[0], 0, reg_src[0]); + shader_arb_get_src_param(ins, &ins->src[2], 1, reg_src[1]); + shader_arb_get_src_param(ins, &ins->src[3], 2, reg_src[2]); + + if (ins->flags & WINED3DSI_TEXLD_PROJECT) flags |= TEX_PROJ; + if (ins->flags & WINED3DSI_TEXLD_BIAS) flags |= TEX_BIAS; + + shader_hw_sample(ins, sampler_idx, reg_dest, reg_src[0], flags, reg_src[1], reg_src[2]); +} + static GLuint create_arb_blt_vertex_program(const WineD3D_GL_Info *gl_info) { GLuint program_id = 0; @@ -2578,7 +2603,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, * Testing shows no performance difference between OPTION NV_fragment_program2 and NV_fragment_program. * So enable the best we can get. */ - if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0) + if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0 || reg_maps->usestexldd) { want_nv_prog = TRUE; } @@ -3466,7 +3491,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXDP3 */ pshader_hw_texdp3, /* WINED3DSIH_TEXDP3TEX */ pshader_hw_texdp3tex, /* WINED3DSIH_TEXKILL */ pshader_hw_texkill, - /* WINED3DSIH_TEXLDD */ NULL, + /* WINED3DSIH_TEXLDD */ shader_hw_texldd, /* WINED3DSIH_TEXLDL */ NULL, /* WINED3DSIH_TEXM3x2DEPTH */ pshader_hw_texm3x2depth, /* WINED3DSIH_TEXM3x2PAD */ pshader_hw_texm3x2pad,

1 0

Alexandre Julliard : libwine: Add unwind annotations to the stack switching functions for x86_64.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: b9fd2c8d4cb972eef7437802f4b7717fb4be5dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fd2c8d4cb972eef7437802f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 14:26:20 2009 +0200 libwine: Add unwind annotations to the stack switching functions for x86_64. --- libs/wine/port.c | 57 ++++++++--------------------------------------------- 1 files changed, 9 insertions(+), 48 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 65f4912..6307069 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -53,30 +53,7 @@ void wine_pthread_set_functions( const struct wine_pthread_functions *functions, * * Switch to the specified stack and call the function. */ -void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, void *stack ); -#if defined(__i386__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_switch_to_stack, - "movl 4(%esp),%ecx\n\t" /* func */ - "movl 8(%esp),%edx\n\t" /* arg */ - "movl 12(%esp),%esp\n\t" /* stack */ - "andl $~15,%esp\n\t" - "subl $12,%esp\n\t" - "pushl %edx\n\t" - "xorl %ebp,%ebp\n\t" - "call *%ecx\n\t" - "int $3" /* we never return here */ ) -#elif defined(__i386__) && defined(_MSC_VER) -__declspec(naked) void wine_switch_to_stack( void (*func)(void *), void *arg, void *stack ) -{ - __asm mov ecx, 4[esp]; - __asm mov edx, 8[esp]; - __asm mov esp, 12[esp]; - __asm push edx; - __asm xor ebp, ebp; - __asm call [ecx]; - __asm int 3; -} -#elif defined(__sparc__) && defined(__GNUC__) +#if defined(__sparc__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_switch_to_stack, "mov %o0, %l0\n\t" /* store first argument */ "mov %o1, %l1\n\t" /* store second argument */ @@ -92,16 +69,6 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack, "subi r1,r1,0x100\n\t" /* adjust stack pointer */ "bctrl\n" /* call ctr */ "1:\tb 1b") /* loop */ -#elif defined(__powerpc__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_switch_to_stack, - "mtctr 3\n\t" /* func -> ctr */ - "mr 3,4\n\t" /* args -> function param 1 (r3) */ - "mr 1,5\n\t" /* stack */ - "subi 1, 1, 16\n\t" /* allocate space for the callee */ - "li 0, 0\n\t" /* load zero */ - "stw 0, 0(1)\n\t" /* create a bottom stack frame */ - "bctrl\n\t" /* call ctr */ - "1:\tb 1b") /* loop */ #elif defined(__ALPHA__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_switch_to_stack, "mov $16,$0\n\t" /* func */ @@ -109,15 +76,6 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack, "mov $18,$30\n\t" /* stack */ "jsr $31,($0),0\n\t" /* call func */ "L1:\tbr $31,L1") /* loop */ -#elif defined(__x86_64__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_switch_to_stack, - "movq %rdi,%rax\n\t" /* func */ - "movq %rsi,%rdi\n\t" /* arg */ - "andq $~15,%rdx\n\t" /* stack */ - "movq %rdx,%rsp\n\t" - "xorq %rbp,%rbp\n\t" - "callq *%rax\n\t" /* call func */ - "int $3") #else void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, void *stack ) { @@ -170,17 +128,20 @@ __declspec(naked) int wine_call_on_stack( int (*func)(void *), void *arg, void * #elif defined(__x86_64__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack, "pushq %rbp\n\t" - "pushq %rbx\n\t" - "movq %rsp,%rbx\n\t" + ".cfi_adjust_cfa_offset 8\n\t" + ".cfi_rel_offset %rbp,0\n\t" + "movq %rsp,%rbp\n\t" + ".cfi_def_cfa_register %rbp\n\t" "movq %rdi,%rax\n\t" /* func */ "movq %rsi,%rdi\n\t" /* arg */ "andq $~15,%rdx\n\t" /* stack */ "movq %rdx,%rsp\n\t" - "xorq %rbp,%rbp\n\t" "callq *%rax\n\t" /* call func */ - "movq %rbx,%rsp\n\t" - "popq %rbx\n\t" + "movq %rbp,%rsp\n\t" + ".cfi_def_cfa_register %rsp\n\t" "popq %rbp\n\t" + ".cfi_adjust_cfa_offset -8\n\t" + ".cfi_same_value %rbp\n\t" "ret") #elif defined(__powerpc__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack,

1 0

Alexandre Julliard : ntdll: Add unwind annotations to the call_entry_point function for x86_64.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: ca4451fa1379d5c5e80dbbeb3bc252a524caa727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4451fa1379d5c5e80dbbeb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 14:26:34 2009 +0200 ntdll: Add unwind annotations to the call_entry_point function for x86_64. --- dlls/ntdll/relay.c | 58 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 6eeb453..0f74c41 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -342,30 +342,40 @@ __ASM_GLOBAL_FUNC( call_entry_point, "\tret" ) #else __ASM_GLOBAL_FUNC( call_entry_point, - "\tpushq %rbp\n" - "\tmovq %rsp,%rbp\n" - "\tpushq %rsi\n" - "\tpushq %rdi\n" - "\tmovq %rcx,%rax\n" - "\tmovq $4,%rcx\n" - "\tcmp %rcx,%rdx\n" - "\tcmovgq %rdx,%rcx\n" - "\tleaq 0(,%rcx,8),%rdx\n" - "\tsubq %rdx,%rsp\n" - "\tandq $~15,%rsp\n" - "\tmovq %rsp,%rdi\n" - "\tmovq %r8,%rsi\n" - "\trep; movsq\n" - "\tmovq 0(%rsp),%rcx\n" - "\tmovq 8(%rsp),%rdx\n" - "\tmovq 16(%rsp),%r8\n" - "\tmovq 24(%rsp),%r9\n" - "\tcallq *%rax\n" - "\tleaq -16(%rbp),%rsp\n" - "\tpopq %rdi\n" - "\tpopq %rsi\n" - "\tpopq %rbp\n" - "\tret\n" ) + "pushq %rbp\n\t" + ".cfi_adjust_cfa_offset 8\n\t" + ".cfi_rel_offset %rbp,0\n\t" + "movq %rsp,%rbp\n\t" + ".cfi_def_cfa_register %rbp\n\t" + "pushq %rsi\n\t" + ".cfi_rel_offset %rsi,-8\n\t" + "pushq %rdi\n\t" + ".cfi_rel_offset %rdi,-16\n\t" + "movq %rcx,%rax\n\t" + "movq $4,%rcx\n\t" + "cmp %rcx,%rdx\n\t" + "cmovgq %rdx,%rcx\n\t" + "leaq 0(,%rcx,8),%rdx\n\t" + "subq %rdx,%rsp\n\t" + "andq $~15,%rsp\n\t" + "movq %rsp,%rdi\n\t" + "movq %r8,%rsi\n\t" + "rep; movsq\n\t" + "movq 0(%rsp),%rcx\n\t" + "movq 8(%rsp),%rdx\n\t" + "movq 16(%rsp),%r8\n\t" + "movq 24(%rsp),%r9\n\t" + "callq *%rax\n\t" + "leaq -16(%rbp),%rsp\n\t" + "popq %rdi\n\t" + ".cfi_same_value %rdi\n\t" + "popq %rsi\n\t" + ".cfi_same_value %rsi\n\t" + ".cfi_def_cfa_register %rsp\n\t" + "popq %rbp\n\t" + ".cfi_adjust_cfa_offset -8\n\t" + ".cfi_same_value %rbp\n\t" + "ret") #endif

1 0

Alexandre Julliard : winebuild: Add unwind annotations to all the generated functions for x86_64.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 873e027e01bdf6be9df552a21d9020482f22fcc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873e027e01bdf6be9df552a21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 14:26:51 2009 +0200 winebuild: Add unwind annotations to all the generated functions for x86_64. --- tools/winebuild/import.c | 41 +++++++++++++++--------- tools/winebuild/relay.c | 77 +++++++++++++++++++++++++++------------------- tools/winebuild/spec32.c | 16 ++++++--- 3 files changed, 81 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=873e027e01bdf6be9df55…

1 0

Mike Kaplinskiy : wininet: Make \r and \n valid header separators.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 6c767c4e2ca1da1f1f7f678a9034ce99b0caf1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c767c4e2ca1da1f1f7f678a9… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Jun 14 18:29:31 2009 -0400 wininet: Make \r and \n valid header separators. --- dlls/wininet/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2721427..1922835 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -741,7 +741,7 @@ static BOOL HTTP_HttpAddRequestHeadersW(LPWININETHTTPREQW lpwhr, while (*lpszEnd != '\0') { - if (*lpszEnd == '\r' && *(lpszEnd + 1) == '\n') + if (*lpszEnd == '\r' || *lpszEnd == '\n') break; lpszEnd++; } @@ -749,10 +749,10 @@ static BOOL HTTP_HttpAddRequestHeadersW(LPWININETHTTPREQW lpwhr, if (*lpszStart == '\0') break; - if (*lpszEnd == '\r') + if (*lpszEnd == '\r' || *lpszEnd == '\n') { *lpszEnd = '\0'; - lpszEnd += 2; /* Jump over \r\n */ + lpszEnd++; /* Jump over newline */ } TRACE("interpreting header %s\n", debugstr_w(lpszStart)); if (*lpszStart == '\0')

1 0

Mike Kaplinskiy : wininet/test: Test malformed header separators.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 413934cac50b80b1db72a1e273714ec3a7fbf949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413934cac50b80b1db72a1e27… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Jun 14 18:30:07 2009 -0400 wininet/test: Test malformed header separators. --- dlls/wininet/tests/http.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6b20043..ba72629 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1453,6 +1453,29 @@ static void HttpHeaders_test(void) ok(index == 1, "Index was not incremented\n"); ok(strcmp(buffer,"value")==0, "incorrect string was returned(%s)\n",buffer); + /* Ensure that malformed header separators are ignored and don't cause a failure */ + ok(HttpAddRequestHeaders(hRequest,"\r\rMalformedTest:value\n\nMalformedTestTwo: value2\rMalformedTestThree: value3\n\n\r\r\n",-1, HTTP_ADDREQ_FLAG_ADD|HTTP_ADDREQ_FLAG_REPLACE), + "Failed to add header with malformed entries in list\n"); + + index = 0; + len = sizeof(buffer); + strcpy(buffer,"MalformedTest"); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index),"Unable to query header\n"); + ok(index == 1, "Index was not incremented\n"); + ok(strcmp(buffer,"value")==0, "incorrect string was returned(%s)\n",buffer); + index = 0; + len = sizeof(buffer); + strcpy(buffer,"MalformedTestTwo"); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index),"Unable to query header\n"); + ok(index == 1, "Index was not incremented\n"); + ok(strcmp(buffer,"value2")==0, "incorrect string was returned(%s)\n",buffer); + index = 0; + len = sizeof(buffer); + strcpy(buffer,"MalformedTestThree"); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index),"Unable to query header\n"); + ok(index == 1, "Index was not incremented\n"); + ok(strcmp(buffer,"value3")==0, "incorrect string was returned(%s)\n",buffer); + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n");

1 0

Aric Stewart : msctf: Implement ITfContext::GetDocumentMgr.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: dee4e5d5d9466b8d70bdcd55a8b3823773bba641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee4e5d5d9466b8d70bdcd55a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 16 18:37:54 2009 +0900 msctf: Implement ITfContext::GetDocumentMgr. --- dlls/msctf/context.c | 16 +++++++++++++--- dlls/msctf/documentmgr.c | 2 +- dlls/msctf/msctf_internal.h | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 2c7acb0..5eaffcf 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -74,6 +74,7 @@ typedef struct tagContext { TfClientId tidOwner; TfEditCookie defaultCookie; TS_STATUS documentStatus; + ITfDocumentMgr *manager; ITextStoreACP *pITextStoreACP; ITfContextOwnerCompositionSink *pITfContextOwnerCompositionSink; @@ -506,8 +507,15 @@ static HRESULT WINAPI Context_GetDocumentMgr (ITfContext *iface, ITfDocumentMgr **ppDm) { Context *This = (Context *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,ppDm); + + if (!ppDm) + return E_INVALIDARG; + + *ppDm = This->manager; + if (!This->manager) + return S_FALSE; + return S_OK; } static HRESULT WINAPI Context_CreateRangeBackup (ITfContext *iface, @@ -758,7 +766,7 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp return S_OK; } -HRESULT Context_Initialize(ITfContext *iface) +HRESULT Context_Initialize(ITfContext *iface, ITfDocumentMgr *manager) { Context *This = (Context *)iface; @@ -769,6 +777,7 @@ HRESULT Context_Initialize(ITfContext *iface) (IUnknown*)This->pITextStoreACPSink, TS_AS_ALL_SINKS); } This->connected = TRUE; + This->manager = manager; return S_OK; } @@ -783,6 +792,7 @@ HRESULT Context_Uninitialize(ITfContext *iface) This->pITextStoreACPSink = NULL; } This->connected = FALSE; + This->manager = NULL; return S_OK; } diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 3d4dbe9..09cadb6 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -146,7 +146,7 @@ static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) This->contextStack[0] = check; ITfThreadMgrEventSink_OnPushContext(This->ThreadMgrSink,check); - Context_Initialize(check); + Context_Initialize(check, iface); return S_OK; } diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 8e093eb..3b959be 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -40,7 +40,7 @@ extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut); extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This); -extern HRESULT Context_Initialize(ITfContext *cxt); +extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager); extern HRESULT Context_Uninitialize(ITfContext *cxt); extern HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_ACP *tsAcp);

1 0

Stefan Doesinger : wined3d: Unroll loops in ARB if needed.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: c220bafa2c283f298b6027223c064bb5e4275812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c220bafa2c283f298b6027223… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Tue Jun 16 07:36:59 2009 +0200 wined3d: Unroll loops in ARB if needed. This is needed to allow us to claim vs_2_0 support with plain GL_ARB_vertex_program. vs_2_0 allows loops without breaks. --- dlls/wined3d/arb_program_shader.c | 391 ++++++++++++++++++++++++++++++++++--- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 366 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c220bafa2c283f298b602…

1 0

Stefan Doesinger : wined3d: Implement break and breakc.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: dfefbcd00de49194876d5fd54efa9cc54ff84616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfefbcd00de49194876d5fd54… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Wed Jun 3 07:39:29 2009 +0200 wined3d: Implement break and breakc. --- dlls/wined3d/arb_program_shader.c | 90 ++++++++++++++++++++++++++++++++++--- 1 files changed, 84 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 144b694..0800540 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -77,7 +77,13 @@ static unsigned int reserved_vs_const(IWineD3DBaseShader *shader, const WineD3D_ struct control_frame { struct list entry; - BOOL ifc; + enum + { + IF, + IFC, + LOOP, + REP + } type; BOOL muting; BOOL outer_loop; unsigned int loop_no; @@ -2199,6 +2205,74 @@ static void shader_hw_endrep(const struct wined3d_shader_instruction *ins) } } +static const struct control_frame *find_last_loop(const struct shader_arb_ctx_priv *priv) +{ + struct control_frame *control_frame; + + LIST_FOR_EACH_ENTRY(control_frame, &priv->control_frames, struct control_frame, entry) + { + if(control_frame->type == LOOP || control_frame->type == REP) return control_frame; + } + ERR("Could not find loop for break\n"); + return NULL; +} + +static void shader_hw_break(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + const struct control_frame *control_frame = find_last_loop(ins->ctx->backend_data); + BOOL vshader = shader_is_vshader_version(ins->ctx->reg_maps->shader_version.type); + + if(vshader) + { + shader_addline(buffer, "BRA loop_%u_end;\n", control_frame->loop_no); + } + else + { + shader_addline(buffer, "BRK;\n"); + } +} + +static void shader_hw_breakc(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + const struct control_frame *control_frame = find_last_loop(ins->ctx->backend_data); + char src_name0[50]; + char src_name1[50]; + const char *comp; + BOOL vshader = shader_is_vshader_version(ins->ctx->reg_maps->shader_version.type); + + shader_arb_get_src_param(ins, &ins->src[0], 0, src_name0); + shader_arb_get_src_param(ins, &ins->src[1], 1, src_name1); + + switch (ins->flags) + { + case COMPARISON_GT: comp = "GT"; break; + case COMPARISON_EQ: comp = "EQ"; break; + case COMPARISON_GE: comp = "GE"; break; + case COMPARISON_LT: comp = "LT"; break; + case COMPARISON_NE: comp = "NE"; break; + case COMPARISON_LE: comp = "LE"; break; + default: + FIXME("Unrecognized comparison value: %u\n", ins->flags); + comp = "(\?\?)"; + } + + if(vshader) + { + /* SUBC CC, src0, src1" works only in pixel shaders, so use TA to throw + * away the subtraction result + */ + shader_addline(buffer, "SUBC TA, %s, %s;\n", src_name0, src_name1); + shader_addline(buffer, "BRA loop_%u_end (%s.x);\n", control_frame->loop_no, comp); + } + else + { + shader_addline(buffer, "SUBC CC, %s, %s;\n", src_name0, src_name1); + shader_addline(buffer, "BRK (%s.x);\n", comp); + } +} + static GLuint create_arb_blt_vertex_program(const WineD3D_GL_Info *gl_info) { GLuint program_id = 0; @@ -3225,8 +3299,8 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ABS */ shader_hw_map2gl, /* WINED3DSIH_ADD */ shader_hw_map2gl, /* WINED3DSIH_BEM */ pshader_hw_bem, - /* WINED3DSIH_BREAK */ NULL, - /* WINED3DSIH_BREAKC */ NULL, + /* WINED3DSIH_BREAK */ shader_hw_break, + /* WINED3DSIH_BREAKC */ shader_hw_breakc, /* WINED3DSIH_BREAKP */ NULL, /* WINED3DSIH_CALL */ NULL, /* WINED3DSIH_CALLNZ */ NULL, @@ -3483,6 +3557,9 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio control_frame = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*control_frame)); list_add_head(&priv->control_frames, &control_frame->entry); + if(ins->handler_idx == WINED3DSIH_LOOP) control_frame->type = LOOP; + if(ins->handler_idx == WINED3DSIH_REP) control_frame->type = REP; + if(priv->target_version >= NV2) { control_frame->loop_no = priv->num_loops++; @@ -3599,6 +3676,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio { control_frame = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*control_frame)); list_add_head(&priv->control_frames, &control_frame->entry); + control_frame->type = IF; if(!priv->muted && get_bool_const(ins, This, ins->src[0].reg.idx) == FALSE) { @@ -3614,7 +3692,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio { /* IF(bool) and if_cond(a, b) use the same ELSE and ENDIF tokens */ control_frame = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*control_frame)); - control_frame->ifc = TRUE; + control_frame->type = IFC; list_add_head(&priv->control_frames, &control_frame->entry); } else if(ins->handler_idx == WINED3DSIH_ELSE) @@ -3622,7 +3700,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio struct list *e = list_head(&priv->control_frames); control_frame = LIST_ENTRY(e, struct control_frame, entry); - if(control_frame->ifc == FALSE) + if(control_frame->type == IF) { shader_addline(buffer, "#} else {\n"); if(!priv->muted && !control_frame->muting) @@ -3640,7 +3718,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio struct list *e = list_head(&priv->control_frames); control_frame = LIST_ENTRY(e, struct control_frame, entry); - if(!control_frame->ifc) + if(control_frame->type == IF) { shader_addline(buffer, "#} endif\n"); if(control_frame->muting) priv->muted = FALSE;

1 0