January 2007 - Wine-Commits

H. Verbeet : 05/49: wined3d: Only add line numbers for new lines in shader_addline().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: cb26d59d2667ffa69b42aeb5b8c3c214c5eab61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb26d59d2667ffa69b42aeb5b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:30:41 2007 +0100 05/49: wined3d: Only add line numbers for new lines in shader_addline(). --- dlls/wined3d/baseshader.c | 13 +++++++++++-- dlls/wined3d/pixelshader.c | 1 + dlls/wined3d/vertexshader.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5e58721..bd48878 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -57,9 +57,18 @@ int shader_addline( return -1; } + if (buffer->newline) { + TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->bsize, base); + buffer->newline = FALSE; + } else { + TRACE(base); + } + buffer->bsize += rc; - buffer->lineNo++; - TRACE("GL HW (%u, %u) : %s", buffer->lineNo, buffer->bsize, base); + if (buffer->buffer[buffer->bsize-1] == '\n') { + buffer->lineNo++; + buffer->newline = TRUE; + } return 0; } diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 862d56a..ce69e0b 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -832,6 +832,7 @@ inline static VOID IWineD3DPixelShaderIm #endif buffer.bsize = 0; buffer.lineNo = 0; + buffer.newline = TRUE; if (This->baseShader.shader_mode == SHADER_GLSL) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index f68a2fb..cd2d472 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -715,6 +715,7 @@ static VOID IWineD3DVertexShaderImpl_Gen #endif buffer.bsize = 0; buffer.lineNo = 0; + buffer.newline = TRUE; if (This->baseShader.shader_mode == SHADER_GLSL) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3611f87..3ff6b26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1491,6 +1491,7 @@ typedef struct SHADER_BUFFER { char* buffer; unsigned int bsize; unsigned int lineNo; + BOOL newline; } SHADER_BUFFER; /* Undocumented opcode controls */

1 0

H. Verbeet : wined3d: Rename shader_glsl_add_dst() to shader_glsl_add_dst_old(), add shader_glsl_append_dst().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 1bfc08e081a95ea651f6804e0f0aedcc6c99d055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bfc08e081a95ea651f6804e0… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:30:59 2007 +0100 wined3d: Rename shader_glsl_add_dst() to shader_glsl_add_dst_old(), add shader_glsl_append_dst(). --- dlls/wined3d/glsl_shader.c | 47 +++++++++++++++++++++++++++++--------------- 1 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 51c7d32..a2403c1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -504,7 +504,7 @@ static const char * const shift_glsl_tab /** Print the beginning of the generated GLSL string. example: "reg_name.xyzw = vec4(" * Will also change the reg_mask if necessary (not all register types are equal in DX vs GL) */ -static void shader_glsl_add_dst(DWORD param, const char* reg_name, char* reg_mask, char* outStr) { +static void shader_glsl_add_dst_old(DWORD param, const char* reg_name, char* reg_mask, char* outStr) { int shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; char cast[6]; @@ -805,6 +805,21 @@ static DWORD shader_glsl_add_dst_param(S return mask; } +#if 0 +/* Append the destination part of the instruction to the buffer, return the effective write mask */ +static DWORD shader_glsl_append_dst(SHADER_BUFFER *buffer, SHADER_OPCODE_ARG *arg) { + char reg_name[50], write_mask[6], reg_str[100]; + DWORD mask; + int shift; + + shift = (arg->dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + mask = shader_glsl_add_dst_param(arg, arg->dst, arg->dst_addr, reg_name, write_mask, reg_str); + shader_addline(buffer, "%s = %s(", reg_str, shift_glsl_tab[shift]); + + return mask; +} +#endif + /** Process GLSL instruction modifiers */ void shader_glsl_add_instruction_modifiers(SHADER_OPCODE_ARG* arg) { @@ -907,7 +922,7 @@ void shader_glsl_arith(SHADER_OPCODE_ARG shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); strcat(tmpLine, "vec4("); strcat(tmpLine, src0_str); strcat(tmpLine, ")"); @@ -935,7 +950,7 @@ void shader_glsl_mov(SHADER_OPCODE_ARG* shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); shader_addline(buffer, "%s%s)%s;\n", tmpLine, src0_str, dst_mask); } @@ -954,7 +969,7 @@ void shader_glsl_dot(SHADER_OPCODE_ARG* shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpDest); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpDest); /* Need to cast the src vectors to vec3 for dp3, and vec4 for dp4 */ if (curOpcode->opcode == WINED3DSIO_DP4) @@ -979,7 +994,7 @@ void shader_glsl_map2gl(SHADER_OPCODE_AR shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); /* Determine the GLSL function to use based on the opcode */ /* TODO: Possibly make this a table for faster lookups */ @@ -1041,7 +1056,7 @@ void shader_glsl_expp(SHADER_OPCODE_ARG* shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_reg, src_mask, src_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); if (hex_version < WINED3DPS_VERSION(2,0)) { shader_addline(arg->buffer, "tmp0.x = vec4(exp2(floor(%s))).x;\n", src_str); @@ -1064,7 +1079,7 @@ void shader_glsl_rcp(SHADER_OPCODE_ARG* shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_reg, src_mask, src_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); strcat(tmpLine, "1.0 / "); shader_addline(arg->buffer, "%s%s)%s;\n", tmpLine, src_str, dst_mask); } @@ -1079,7 +1094,7 @@ void shader_glsl_compare(SHADER_OPCODE_A shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); /* If we are comparing vectors and not scalars, we should process this through map2gl using the GLSL functions. */ if (strlen(src0_mask) != 2) { @@ -1113,7 +1128,7 @@ void shader_glsl_cmp(SHADER_OPCODE_ARG* shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], src2_reg, src2_mask, src2_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); shader_addline(arg->buffer, "%smix(vec4(%s), vec4(%s), vec4(lessThan(vec4(%s), vec4(0.0)))))%s;\n", tmpLine, src1_str, src2_str, src0_str, dst_mask); } @@ -1130,7 +1145,7 @@ void shader_glsl_cnd(SHADER_OPCODE_ARG* shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], src2_reg, src2_mask, src2_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); shader_addline(arg->buffer, "%s(%s < 0.5) ? %s : %s)%s;\n", tmpLine, src0_str, src1_str, src2_str, dst_mask); } @@ -1147,7 +1162,7 @@ void shader_glsl_mad(SHADER_OPCODE_ARG* shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], src2_reg, src2_mask, src2_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); shader_addline(arg->buffer, "%s(vec4(%s) * vec4(%s)) + vec4(%s))%s;\n", tmpLine, src0_str, src1_str, src2_str, dst_mask); @@ -1219,7 +1234,7 @@ void shader_glsl_lrp(SHADER_OPCODE_ARG* shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], src2_reg, src2_mask, src2_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); shader_addline(arg->buffer, "%s%s + %s * (%s - %s))%s;\n", tmpLine, src2_str, src0_str, src1_str, src2_str, dst_mask); @@ -1687,7 +1702,7 @@ void pshader_glsl_texreg2ar(SHADER_OPCOD shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); shader_addline(arg->buffer, "%stexture2D(Psampler%u, %s.yz))%s;\n", tmpLine, src0_regnum, dst_reg, dst_mask); } @@ -1705,7 +1720,7 @@ void pshader_glsl_texreg2gb(SHADER_OPCOD shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); shader_addline(arg->buffer, "%stexture2D(Psampler%u, %s.yz))%s;\n", tmpLine, src0_regnum, dst_reg, dst_mask); } @@ -1734,7 +1749,7 @@ void pshader_glsl_texreg2rgb(SHADER_OPCO shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); shader_addline(arg->buffer, "%stexture%s(Psampler%u, %s.%s))%s;\n", tmpLine, dimensions, src0_regnum, dst_reg, (stype == WINED3DSTT_2D) ? "xy" : "xyz", dst_mask); } @@ -1762,7 +1777,7 @@ void pshader_glsl_dp2add(SHADER_OPCODE_A shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], src2_reg, src2_mask, src2_str); - shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); shader_addline(arg->buffer, "%sdot(vec2(%s), vec2(%s)) + %s)%s;\n", tmpLine, src0_str, src1_str, src2_str, dst_mask); }

1 0

H. Verbeet : wined3d: Fixup the write mask for gl_FogFragCoord and gl_PointSize.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: b28bd67fd9a117a5261c93e1da123b81b3ebea5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28bd67fd9a117a5261c93e1d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:30:35 2007 +0100 wined3d: Fixup the write mask for gl_FogFragCoord and gl_PointSize. gl_FogFragCoord and gl_PointSize are floats rather than vec4s in GLSL, so they shouldn't have a destination swizzle, and the write mask we return should consist of only the first component. --- dlls/wined3d/glsl_shader.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d88e0e..51c7d32 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -725,12 +725,17 @@ static DWORD shader_glsl_get_write_mask( char *ptr = write_mask; DWORD mask = param & WINED3DSP_WRITEMASK_ALL; - if (mask != WINED3DSP_WRITEMASK_ALL) { - *ptr++ = '.'; - if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + /* gl_FogFragCoord and glPointSize are floats, fixup the write mask. */ + if ((shader_get_regtype(param) == WINED3DSPR_RASTOUT) && ((param & WINED3DSP_REGNUM_MASK) != 0)) { + mask = WINED3DSP_WRITEMASK_0; + } else { + if (mask != WINED3DSP_WRITEMASK_ALL) { + *ptr++ = '.'; + if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; + if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; + if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; + if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + } } *ptr = '\0';

1 0

H. Verbeet : wined3d: Add a comment about D3D write masks and GLSL destination swizzles.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: aa4d88d6f8478aaf464ab8640b3f225aef118de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4d88d6f8478aaf464ab8640… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:30:12 2007 +0100 wined3d: Add a comment about D3D write masks and GLSL destination swizzles. --- dlls/wined3d/glsl_shader.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fd44111..185d530 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -19,6 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* + * D3D shader asm has swizzles on source parameters, and write masks for + * destination parameters. GLSL uses swizzles for both. The result of this is + * that for example "mov dst.xw, src.zyxw" becomes "dst.xw = src.zw" in GLSL. + * Ie, to generate a proper GLSL source swizzle, we need to take the D3D write + * mask for the destination parameter into account. + */ + #include "config.h" #include <stdio.h> #include "wined3d_private.h"

1 0

H. Verbeet : wined3d: Return the (binary) write mask from shader_glsl_add_dst_param().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 16cf41413b5e8d108e4b58fb945b623646c66e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16cf41413b5e8d108e4b58fb9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:30:28 2007 +0100 wined3d: Return the (binary) write mask from shader_glsl_add_dst_param(). --- dlls/wined3d/glsl_shader.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8d41f25..7d88e0e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -721,10 +721,11 @@ static void shader_glsl_get_register_nam } /* Get the GLSL write mask for the destination register */ -static void shader_glsl_get_write_mask(const DWORD param, char *write_mask) { +static DWORD shader_glsl_get_write_mask(const DWORD param, char *write_mask) { char *ptr = write_mask; + DWORD mask = param & WINED3DSP_WRITEMASK_ALL; - if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { + if (mask != WINED3DSP_WRITEMASK_ALL) { *ptr++ = '.'; if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; @@ -733,6 +734,8 @@ static void shader_glsl_get_write_mask(c } *ptr = '\0'; + + return mask; } static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, char *swizzle_str) { @@ -783,15 +786,18 @@ static void shader_glsl_add_src_param(SH /* From a given parameter token, generate the corresponding GLSL string. * Also, return the actual register name and swizzle in case the * caller needs this information as well. */ -static void shader_glsl_add_dst_param(SHADER_OPCODE_ARG* arg, const DWORD param, +static DWORD shader_glsl_add_dst_param(SHADER_OPCODE_ARG* arg, const DWORD param, const DWORD addr_token, char *reg_name, char *write_mask, char *out_str) { BOOL is_color = FALSE; + DWORD mask; write_mask[0] = reg_name[0] = out_str[0] = 0; shader_glsl_get_register_name(param, addr_token, reg_name, &is_color, arg); - shader_glsl_get_write_mask(param, write_mask); + mask = shader_glsl_get_write_mask(param, write_mask); sprintf(out_str, "%s%s", reg_name, write_mask); + + return mask; } /** Process GLSL instruction modifiers */

1 0

Alexandre Julliard : wmc: Use standard format for error messages.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 04ac4bee2150cdc8a2fb775684765fc0ca6ca879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ac4bee2150cdc8a2fb77568… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 16 16:00:55 2007 +0100 wmc: Use standard format for error messages. --- tools/wmc/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 2b3b87c..bdcd6c0 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -36,7 +36,7 @@ static void generic_msg(const char *s, const char *t, va_list ap) { - fprintf(stderr, "%s %s: %d, %d: ", t, input_name ? input_name : "stdin", line_number, char_number); + fprintf(stderr, "%s:%d:%d: %s: ", input_name ? input_name : "stdin", line_number, char_number, t); vfprintf(stderr, s, ap); fprintf(stderr, "\n"); }

1 0

H. Verbeet : wined3d: Split shader_glsl_add_param() in shader_glsl_add_src_param() and shader_glsl_add_dst_param().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 9f4f02b5fb41f768a533dcf00fe40c1b4394de74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f4f02b5fb41f768a533dcf00… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:30:20 2007 +0100 wined3d: Split shader_glsl_add_param() in shader_glsl_add_src_param() and shader_glsl_add_dst_param(). --- dlls/wined3d/glsl_shader.c | 212 +++++++++++++++++++++---------------------- 1 files changed, 104 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f4f02b5fb41f768a533d…

1 0

Alexandre Julliard : ntdll: Added a missing chunk in the NtLockVirtualMemory support.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: dad037400395322c4579320d00980f9f8c323694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad037400395322c4579320d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 16 16:01:28 2007 +0100 ntdll: Added a missing chunk in the NtLockVirtualMemory support. Thanks to Rob Shearman for noticing this. --- dlls/ntdll/sync.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index eff643e..1778bb2 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -764,6 +764,22 @@ static BOOL call_apcs( BOOL alertable ) &result.virtual_flush.addr, &result.virtual_flush.size, 0 ); break; + case APC_VIRTUAL_LOCK: + result.type = call.type; + result.virtual_lock.addr = call.virtual_lock.addr; + result.virtual_lock.size = call.virtual_lock.size; + result.virtual_lock.status = NtLockVirtualMemory( NtCurrentProcess(), + &result.virtual_lock.addr, + &result.virtual_lock.size, 0 ); + break; + case APC_VIRTUAL_UNLOCK: + result.type = call.type; + result.virtual_unlock.addr = call.virtual_unlock.addr; + result.virtual_unlock.size = call.virtual_unlock.size; + result.virtual_unlock.status = NtUnlockVirtualMemory( NtCurrentProcess(), + &result.virtual_unlock.addr, + &result.virtual_unlock.size, 0 ); + break; default: server_protocol_error( "get_apc_request: bad type %d\n", call.type ); break;

1 0

Alexandre Julliard : wmc: Added support for neutral languages.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 90b839592b3c27e1a9a7c651607f0f1a8d687fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b839592b3c27e1a9a7c6516… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 16 11:43:56 2007 +0100 wmc: Added support for neutral languages. --- tools/wmc/lang.c | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 45 insertions(+), 5 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index dab6c54..e33a655 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -33,7 +33,47 @@ */ static const language_t languages[] = { - {0x0000, 437, 1252, "Neutral", "Neutral"}, + {0x0000, 437, 1252, "Neutral", NULL}, + {0x0002, 866, 1251, "Bulgarian", NULL}, + {0x0003, 850, 1252, "Catalan", NULL}, + {0x0005, 852, 1250, "Czech", NULL}, + {0x0006, 850, 1252, "Danish", NULL}, + {0x0007, 850, 1252, "German", NULL}, + {0x0008, 737, 1253, "Greek", NULL}, + {0x0009, 437, 1252, "English", NULL}, + {0x000A, 850, 1252, "Spanish - Traditional Sort", NULL}, + {0x000B, 850, 1252, "Finnish", NULL}, + {0x000C, 850, 1252, "French", NULL}, + {0x000E, 852, 1250, "Hungarian", NULL}, + {0x000F, 850, 1252, "Icelandic", NULL}, + {0x0010, 850, 1252, "Italian", NULL}, + {0x0011, 932, 932, "Japanese", NULL}, + {0x0012, 949, 949, "Korean", NULL}, + {0x0013, 850, 1252, "Dutch", NULL}, + {0x0014, 850, 1252, "Norwegian (Bokm�l)", NULL}, + {0x0015, 852, 1250, "Polish", NULL}, + {0x0016, 850, 1252, "Portuguese", NULL}, + {0x0018, 852, 1250, "Romanian", NULL}, + {0x0019, 866, 1251, "Russian", NULL}, + {0x001A, 852, 1250, "Serbian", NULL}, + {0x001B, 852, 1250, "Slovak", NULL}, + {0x001C, 852, 1250, "Albanian", NULL}, + {0x001D, 850, 1252, "Swedish", NULL}, + {0x001F, 857, 1254, "Turkish", NULL}, + {0x0021, 850, 1252, "Indonesian", NULL}, + {0x0022, 866, 1251, "Ukrainian", NULL}, + {0x0023, 866, 1251, "Belarusian", NULL}, + {0x0024, 852, 1250, "Slovene", NULL}, + {0x0025, 775, 1257, "Estonian", NULL}, + {0x0026, 775, 1257, "Latvian", NULL}, + {0x0027, 775, 1257, "Lithuanian", NULL}, + {0x002A,1258, 1258, "Vietnamese", NULL}, + {0x002D, 850, 1252, "Basque", NULL}, + {0x002F, 866, 1251, "Macedonian", NULL}, + {0x0036, 850, 1252, "Afrikaans", NULL}, + {0x0038, 852, 1252, "Faroese", NULL}, + {0x003C, 437, 1252, "Irish", NULL}, + {0x003E, 850, 1252, "Malay", NULL}, {0x0402, 866, 1251, "Bulgarian", "Bulgaria"}, {0x0403, 850, 1252, "Catalan", "Spain"}, {0x0405, 852, 1250, "Czech", "Czech Republic"}, @@ -67,11 +107,11 @@ static const language_t languages[] = { {0x0425, 775, 1257, "Estonian", "Estonia"}, {0x0426, 775, 1257, "Latvian", "Latvia"}, {0x0427, 775, 1257, "Lithuanian", "Lithuania"}, -/* {0x042A, ?, ?, "Vietnamese", "Vietnam"},*/ + {0x042A,1258, 1258, "Vietnamese", "Vietnam"}, {0x042D, 850, 1252, "Basque", "Spain"}, {0x042F, 866, 1251, "Macedonian", "Former Yugoslav Republic of Macedonia"}, {0x0436, 850, 1252, "Afrikaans", "South Africa"}, -/* {0x0438, 852, 1252, "Faroese", "Faroe Islands"}, FIXME: Not sure about codepages */ + {0x0438, 852, 1252, "Faroese", "Faroe Islands"}, {0x043C, 437, 1252, "Irish", "Ireland"}, {0x043E, 850, 1252, "Malay", "Malaysia"}, /* {0x048F, ?, ?, "Esperanto", "<none>"},*/ @@ -84,7 +124,7 @@ static const language_t languages[] = { {0x0813, 850, 1252, "Dutch", "Belgium"}, {0x0814, 850, 1252, "Norwegian (Nynorsk)", "Norway"}, {0x0816, 850, 1252, "Portuguese", "Portugal"}, -/* {0x081A, ?, ?, "Serbian (latin)", "Yugoslavia"},*/ + {0x081A, 852, 1250, "Serbian (latin)", "Yugoslavia"}, {0x081D, 850, 1252, "Swedish (Finland)", "Finland"}, {0x0C07, 850, 1252, "German", "Austria"}, {0x0C09, 850, 1252, "English", "Australia"}, @@ -135,7 +175,7 @@ void show_languages(void) languages[i].doscp, languages[i].wincp, languages[i].name, - languages[i].country); + languages[i].country ? languages[i].country : "Neutral"); } static int langcmp(const void *p1, const void *p2)

1 0

Alexandre Julliard : msvcrt: Export various locale and codepage variables.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 6f9ad1b981a32b617da74e083a4a5e7bf43d9c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9ad1b981a32b617da74e083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 16 12:08:59 2007 +0100 msvcrt: Export various locale and codepage variables. --- dlls/msvcrt/locale.c | 25 +++++++++++++++---------- dlls/msvcrt/mbcs.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 6 +++--- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index aea5488..5e08873 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -45,7 +45,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define MAX_LOCALE_LENGTH 256 char MSVCRT_current_lc_all[MAX_LOCALE_LENGTH]; LCID MSVCRT_current_lc_all_lcid; -int msvcrt_current_lc_all_cp; +int MSVCRT___lc_codepage; +int MSVCRT___lc_collate_cp; +HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1]; /* MT */ #define LOCK_LOCALE _mlock(_SETLOCALE_LOCK); @@ -275,7 +277,8 @@ static void msvcrt_set_ctype(unsigned in unsigned char *traverse = (unsigned char *)cp.LeadByte; memset(MSVCRT_current_ctype, 0, sizeof(MSVCRT__ctype)); - msvcrt_current_lc_all_cp = codepage; + MSVCRT___lc_codepage = codepage; + MSVCRT___lc_collate_cp = codepage; /* Switch ctype macros to MBCS if needed */ MSVCRT___mb_cur_max = cp.MaxCharSize; @@ -342,7 +345,8 @@ char* CDECL MSVCRT_setlocale(int categor { MSVCRT_current_lc_all[0] = 'C'; MSVCRT_current_lc_all[1] = '\0'; - msvcrt_current_lc_all_cp = GetACP(); + MSVCRT___lc_codepage = GetACP(); + MSVCRT___lc_collate_cp = GetACP(); switch (category) { case MSVCRT_LC_ALL: @@ -535,22 +539,22 @@ int CDECL _setmbcp(int cp) LOCK_LOCALE; if ( cp > _MB_CP_SBCS) { - if( msvcrt_current_lc_all_cp != cp) + if( MSVCRT___lc_codepage != cp) /* FIXME: set ctype behaviour for this cp */ - msvcrt_current_lc_all_cp = cp; + MSVCRT___lc_codepage = cp; } else if(cp == _MB_CP_ANSI) { - msvcrt_current_lc_all_cp = GetACP(); + MSVCRT___lc_codepage = GetACP(); } else if(cp == _MB_CP_OEM) { - msvcrt_current_lc_all_cp = GetOEMCP(); + MSVCRT___lc_codepage = GetOEMCP(); } else if(cp == _MB_CP_LOCALE) { GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, - (WCHAR *)&msvcrt_current_lc_all_cp, sizeof(INT)/sizeof(WCHAR) ); + (WCHAR *)&MSVCRT___lc_codepage, sizeof(INT)/sizeof(WCHAR) ); } else if(cp == _MB_CP_SBCS) { @@ -560,8 +564,9 @@ int CDECL _setmbcp(int cp) { FIXME ("Unreal codepages (e.g. %d) not implemented\n", cp); } + MSVCRT___lc_collate_cp = MSVCRT___lc_codepage; UNLOCK_LOCALE; - TRACE("(%d) -> %d\n", cp, msvcrt_current_lc_all_cp); + TRACE("(%d) -> %d\n", cp, MSVCRT___lc_codepage); return 0; } @@ -570,7 +575,7 @@ int CDECL _setmbcp(int cp) */ int CDECL _getmbcp(void) { - return msvcrt_current_lc_all_cp; + return MSVCRT___lc_codepage; } /********************************************************************* diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 91549eb..6546ede 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -46,7 +46,7 @@ static MSVCRT_wchar_t msvcrt_mbc_to_wc(u mbch[1] = ch & 0xff; n_chars = 2; } - if (!MultiByteToWideChar(msvcrt_current_lc_all_cp, 0, mbch, n_chars, &chW, 1)) + if (!MultiByteToWideChar(MSVCRT___lc_codepage, 0, mbch, n_chars, &chW, 1)) { WARN("MultiByteToWideChar failed on %x\n", ch); return 0; @@ -745,7 +745,7 @@ unsigned int CDECL _mbbtombc(unsigned in int CDECL _ismbbkana(unsigned int c) { /* FIXME: use lc_ctype when supported, not lc_all */ - if(msvcrt_current_lc_all_cp == 932) + if(MSVCRT___lc_codepage == 932) { /* Japanese/Katakana, CP 932 */ return (c >= 0xa1 && c <= 0xdf); @@ -855,7 +855,7 @@ int CDECL _ismbcpunct(unsigned int ch) int CDECL _ismbchira(unsigned int c) { /* FIXME: use lc_ctype when supported, not lc_all */ - if(msvcrt_current_lc_all_cp == 932) + if(MSVCRT___lc_codepage == 932) { /* Japanese/Hiragana, CP 932 */ return (c >= 0x829f && c <= 0x82f1); @@ -869,7 +869,7 @@ int CDECL _ismbchira(unsigned int c) int CDECL _ismbckata(unsigned int c) { /* FIXME: use lc_ctype when supported, not lc_all */ - if(msvcrt_current_lc_all_cp == 932) + if(MSVCRT___lc_codepage == 932) { if(c < 256) return _ismbbkana(c); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3a50af2..68fa119 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -111,7 +111,7 @@ typedef struct __thread_data thread_data extern thread_data_t *msvcrt_get_thread_data(void); -extern int msvcrt_current_lc_all_cp; +extern int MSVCRT___lc_codepage; void msvcrt_set_errno(int); char* msvcrt_strndup(const char*,unsigned int); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 165ad42..9130322 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -96,9 +96,10 @@ @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf -# extern __lc_codepage +@ extern __lc_codepage MSVCRT___lc_codepage @ stub __lc_collate -# extern __lc_handle +@ extern __lc_collate_cp MSVCRT___lc_collate_cp +@ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() @ extern __mb_cur_max MSVCRT___mb_cur_max @ cdecl __p___argc() @@ -767,4 +768,3 @@ @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wscanf(wstr) MSVCRT_wscanf -# extern __lc_collate_cp

1 0