July 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d9/tests: Add a test for handling floating point specials in shaders.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: da0582a624d5f25234a41ce7853b7e8aea2a0a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0582a624d5f25234a41ce78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 29 12:56:55 2010 +0200 d3d9/tests: Add a test for handling floating point specials in shaders. --- dlls/d3d9/tests/visual.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 202 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da0582a624d5f25234a41…

1 0

Henri Verbeet : wined3d: Clamp vertex shader outputs.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 4936e71828669ef084f9cf243f924a11a2cdce50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4936e71828669ef084f9cf243… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 29 12:56:54 2010 +0200 wined3d: Clamp vertex shader outputs. To avoid having to interpolate infinities over fragments. --- dlls/wined3d/glsl_shader.c | 57 +++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 42e4311..7f772a2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1180,8 +1180,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } } - shader_addline(buffer, "const float FLT_MAX = 1e38;\n"); - /* Start the main program */ shader_addline(buffer, "void main() {\n"); if(pshader && reg_maps->vpos) { @@ -2206,13 +2204,13 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins) if (dst_size > 1) { - shader_addline(buffer, "vec%d(%s == 0.0 ? 0.0 : pow(abs(%s), %s)));\n", - dst_size, src0_param.param_str, src0_param.param_str, src1_param.param_str); + shader_addline(buffer, "vec%u(pow(abs(%s), %s)));\n", + dst_size, src0_param.param_str, src1_param.param_str); } else { - shader_addline(buffer, "%s == 0.0 ? 0.0 : pow(abs(%s), %s));\n", - src0_param.param_str, src0_param.param_str, src1_param.param_str); + shader_addline(buffer, "pow(abs(%s), %s));\n", + src0_param.param_str, src1_param.param_str); } } @@ -2233,13 +2231,13 @@ static void shader_glsl_log(const struct wined3d_shader_instruction *ins) if (dst_size > 1) { - shader_addline(buffer, "vec%d(%s == 0.0 ? -FLT_MAX : log2(abs(%s))));\n", - dst_size, src0_param.param_str, src0_param.param_str); + shader_addline(buffer, "vec%u(log2(abs(%s))));\n", + dst_size, src0_param.param_str); } else { - shader_addline(buffer, "%s == 0.0 ? -FLT_MAX : log2(abs(%s)));\n", - src0_param.param_str, src0_param.param_str); + shader_addline(buffer, "log2(abs(%s)));\n", + src0_param.param_str); } } @@ -2367,13 +2365,13 @@ static void shader_glsl_rcp(const struct wined3d_shader_instruction *ins) if (mask_size > 1) { - shader_addline(ins->ctx->buffer, "vec%d(%s == 0.0 ? FLT_MAX : 1.0 / %s));\n", - mask_size, src_param.param_str, src_param.param_str); + shader_addline(ins->ctx->buffer, "vec%u(1.0 / %s));\n", + mask_size, src_param.param_str); } else { - shader_addline(ins->ctx->buffer, "%s == 0.0 ? FLT_MAX : 1.0 / %s);\n", - src_param.param_str, src_param.param_str); + shader_addline(ins->ctx->buffer, "1.0 / %s);\n", + src_param.param_str); } } @@ -2391,13 +2389,13 @@ static void shader_glsl_rsq(const struct wined3d_shader_instruction *ins) if (mask_size > 1) { - shader_addline(buffer, "vec%d(%s == 0.0 ? FLT_MAX : inversesqrt(abs(%s))));\n", - mask_size, src_param.param_str, src_param.param_str); + shader_addline(buffer, "vec%u(inversesqrt(abs(%s))));\n", + mask_size, src_param.param_str); } else { - shader_addline(buffer, "%s == 0.0 ? FLT_MAX : inversesqrt(abs(%s)));\n", - src_param.param_str, src_param.param_str); + shader_addline(buffer, "inversesqrt(abs(%s)));\n", + src_param.param_str); } } @@ -3772,7 +3770,7 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, const struct set[in_idx] = mask; shader_glsl_write_mask_to_str(mask, reg_mask); - shader_addline(buffer, "%s%s = OUT[%u]%s;\n", + shader_addline(buffer, "%s%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", destination, reg_mask, j, reg_mask); } } @@ -3822,6 +3820,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer shader_buffer_clear(buffer); shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "const float FLT_MAX = 1e38;\n"); if (ps_major < 3) { @@ -3841,13 +3840,16 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_COLOR)) { if (semantic_idx == 0) - shader_addline(buffer, "gl_FrontColor%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); + shader_addline(buffer, "gl_FrontColor%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + reg_mask, i, reg_mask); else if (semantic_idx == 1) - shader_addline(buffer, "gl_FrontSecondaryColor%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); + shader_addline(buffer, "gl_FrontSecondaryColor%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + reg_mask, i, reg_mask); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_POSITION)) { - shader_addline(buffer, "gl_Position%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); + shader_addline(buffer, "gl_Position%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + reg_mask, i, reg_mask); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_TEXCOORD)) { @@ -3856,7 +3858,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (!(gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) write_mask |= WINED3DSP_WRITEMASK_3; - shader_addline(buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n", + shader_addline(buffer, "gl_TexCoord[%u]%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", semantic_idx, reg_mask, i, reg_mask); if (!(write_mask & WINED3DSP_WRITEMASK_3)) shader_addline(buffer, "gl_TexCoord[%u].w = 1.0;\n", semantic_idx); @@ -3864,11 +3866,11 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_PSIZE)) { - shader_addline(buffer, "gl_PointSize = OUT[%u].%c;\n", i, reg_mask[1]); + shader_addline(buffer, "gl_PointSize = clamp(OUT[%u].%c, -FLT_MAX, FLT_MAX);\n", i, reg_mask[1]); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_FOG)) { - shader_addline(buffer, "gl_FogFragCoord = OUT[%u].%c;\n", i, reg_mask[1]); + shader_addline(buffer, "gl_FogFragCoord = clamp(OUT[%u].%c, -FLT_MAX, FLT_MAX);\n", i, reg_mask[1]); } } shader_addline(buffer, "}\n"); @@ -3890,11 +3892,12 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_POSITION)) { - shader_addline(buffer, "gl_Position%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); + shader_addline(buffer, "gl_Position%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + reg_mask, i, reg_mask); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_PSIZE)) { - shader_addline(buffer, "gl_PointSize = OUT[%u].%c;\n", i, reg_mask[1]); + shader_addline(buffer, "gl_PointSize = clamp(OUT[%u].%c, -FLT_MAX, FLT_MAX);\n", i, reg_mask[1]); } }

1 0

Henri Verbeet : wined3d: Unify vertex shader output handling between shader models.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 2114a369360bd49a1d89f1b344a83fcc8601c1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2114a369360bd49a1d89f1b34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 29 12:56:53 2010 +0200 wined3d: Unify vertex shader output handling between shader models. --- dlls/wined3d/glsl_shader.c | 170 +++++++++----------------------------------- dlls/wined3d/shader.c | 83 ++++++++++++++++++++-- 2 files changed, 111 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2114a369360bd49a1d89f…

1 0

Harald Hoyer : preloader: Fix moving of auxiliary values.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 2bea45dd0a0ca74f53d1560e7498419962b9c34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bea45dd0a0ca74f53d1560e7… Author: Harald Hoyer <harald(a)redhat.com> Date: Thu Jul 29 12:02:06 2010 +0200 preloader: Fix moving of auxiliary values. --- loader/preloader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 83a5172..2dc2872 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -519,7 +519,7 @@ static void set_auxiliary_values( ElfW(auxv_t) *av, const ElfW(auxv_t) *new_av, } else if (new_count < delete_count) /* get rid of unused values */ { - int len = (char *)(av + av_count + 1) - dst; + int len = (char *)(av + av_count + 1) - src; for (i = len - 1; i >= 0; i--) dst[i] = src[i]; } *stack = dst;

1 0

Stefan Dösinger : wined3d: Fix an msvc anachronism warning.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 6a87681b11ddbed36d9f34f4e5ce51c5452ad082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a87681b11ddbed36d9f34f4e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:29:15 2010 +0200 wined3d: Fix an msvc anachronism warning. --- dlls/wined3d/wined3d_main.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 6330eba..991ea80 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -46,8 +46,8 @@ struct wined3d_wndproc_table static struct wined3d_wndproc_table wndproc_table; int num_lock = 0; -void (*CDECL wine_tsx11_lock_ptr)(void) = NULL; -void (*CDECL wine_tsx11_unlock_ptr)(void) = NULL; +void (CDECL *wine_tsx11_lock_ptr)(void) = NULL; +void (CDECL *wine_tsx11_unlock_ptr)(void) = NULL; static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc5757b..8b7a0b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -728,8 +728,8 @@ extern const shader_backend_t none_shader_backend DECLSPEC_HIDDEN; /* X11 locking */ -extern void (* CDECL wine_tsx11_lock_ptr)(void) DECLSPEC_HIDDEN; -extern void (* CDECL wine_tsx11_unlock_ptr)(void) DECLSPEC_HIDDEN; +extern void (CDECL *wine_tsx11_lock_ptr)(void) DECLSPEC_HIDDEN; +extern void (CDECL *wine_tsx11_unlock_ptr)(void) DECLSPEC_HIDDEN; /* As GLX relies on X, this is needed */ extern int num_lock DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Use a int for the mantissa in float_24_to_32.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 81b03d88910cb3a268d04c2d42732cd0ecc65eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b03d88910cb3a268d04c2d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:06:38 2010 +0200 wined3d: Use a int for the mantissa in float_24_to_32. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e53c90..bc5757b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,7 +205,7 @@ static inline float float_24_to_32(DWORD in) { const float sgn = in & 0x800000 ? -1.0f : 1.0f; const unsigned short e = (in & 0x780000) >> 19; - const unsigned short m = in & 0x7ffff; + const unsigned int m = in & 0x7ffff; if (e == 0) {

1 0

Stefan Dösinger : wined3d: Add casts for int to float conversions.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: cc8a45321fb97994820dfdc52d7b845e4d4e1ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8a45321fb97994820dfdc52… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:39:03 2010 +0200 wined3d: Add casts for int to float conversions. --- dlls/wined3d/arb_program_shader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4482d53..0617fe3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -582,9 +582,9 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) if(gl_shader->int_consts[i] != WINED3D_CONST_NUM_UNUSED) { float val[4]; - val[0] = stateBlock->pixelShaderConstantI[4 * i]; - val[1] = stateBlock->pixelShaderConstantI[4 * i + 1]; - val[2] = stateBlock->pixelShaderConstantI[4 * i + 2]; + val[0] = (float) stateBlock->pixelShaderConstantI[4 * i]; + val[1] = (float) stateBlock->pixelShaderConstantI[4 * i + 1]; + val[2] = (float) stateBlock->pixelShaderConstantI[4 * i + 2]; val[3] = -1.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->int_consts[i], val)); @@ -614,9 +614,9 @@ static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl) if(gl_shader->int_consts[i] != WINED3D_CONST_NUM_UNUSED) { float val[4]; - val[0] = stateBlock->vertexShaderConstantI[4 * i]; - val[1] = stateBlock->vertexShaderConstantI[4 * i + 1]; - val[2] = stateBlock->vertexShaderConstantI[4 * i + 2]; + val[0] = (float) stateBlock->vertexShaderConstantI[4 * i]; + val[1] = (float) stateBlock->vertexShaderConstantI[4 * i + 1]; + val[2] = (float) stateBlock->vertexShaderConstantI[4 * i + 2]; val[3] = -1.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->int_consts[i], val)); @@ -1058,7 +1058,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction else if (reg->idx >= rel_offset) sprintf(register_name, "C[%s + %u]", rel_reg, reg->idx - rel_offset); else - sprintf(register_name, "C[%s - %u]", rel_reg, -reg->idx + rel_offset); + sprintf(register_name, "C[%s - %u]", rel_reg, rel_offset - reg->idx); } else { @@ -6981,7 +6981,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac GLenum shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - float size[4] = {surface->pow2Width, surface->pow2Height, 1, 1}; + float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; struct arbfp_blit_priv *priv = device->blit_priv; enum complex_fixup fixup; GLenum textype = surface->texture_target;

1 0

Stefan Dösinger : wined3d: Use powf instead of pow.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: b25f22e45648ff07453fcc63ab2dbe0f488cc706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25f22e45648ff07453fcc63a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:05:37 2010 +0200 wined3d: Use powf instead of pow. --- dlls/wined3d/wined3d_private.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77ef661..7e53c90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -192,9 +192,9 @@ static inline float float_16_to_32(const unsigned short *in) { if(e == 0) { if(m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ - else return sgn * pow(2, -14.0f) * ((float)m / 1024.0f); + else return sgn * powf(2, -14.0f) * ((float)m / 1024.0f); } else if(e < 31) { - return sgn * pow(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); + return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { if(m == 0) return sgn / 0.0f; /* +INF / -INF */ else return 0.0f / 0.0f; /* NAN */ @@ -210,11 +210,11 @@ static inline float float_24_to_32(DWORD in) if (e == 0) { if (m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ - else return sgn * pow(2, -6.0f) * ((float)m / 524288.0f); + else return sgn * powf(2, -6.0f) * ((float)m / 524288.0f); } else if (e < 15) { - return sgn * pow(2, (float)e - 7.0f) * (1.0f + ((float)m / 524288.0f)); + return sgn * powf(2, (float)e - 7.0f) * (1.0f + ((float)m / 524288.0f)); } else {

1 0

Igor Paliychuk : comdlg32: Fixed Ukrainian standard dialog sizes.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: f0de2d9d257341194f17c2a5cb09bcee08323617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0de2d9d257341194f17c2a5c… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Thu Jul 29 11:21:43 2010 +0300 comdlg32: Fixed Ukrainian standard dialog sizes. --- dlls/comdlg32/cdlg_Uk.rc | 54 +++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/comdlg32/cdlg_Uk.rc b/dlls/comdlg32/cdlg_Uk.rc index 3cca40c..6b58806 100644 --- a/dlls/comdlg32/cdlg_Uk.rc +++ b/dlls/comdlg32/cdlg_Uk.rc @@ -152,31 +152,31 @@ FONT 8, "MS Shell Dlg" } -CHOOSE_COLOR DIALOG 36, 24, 310, 185 +CHOOSE_COLOR DIALOG 36, 24, 300, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�� " FONT 8, "MS Shell Dlg" { LTEXT "&�� :", 1088, 4, 4, 140, 10 LTEXT "�&�� :", 1089, 4, 106, 140, 10 - LTEXT "��|��&��", 1090, 148, 151, 48, 10 - LTEXT "&��:", 726 /*1094*/,258,126,24,10 - EDITTEXT 706, 281,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&��:",727/*1095*/,258,140,24,10 - EDITTEXT 707, 281,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "�&��:",728 /*1096*/,258,154,24,10 - EDITTEXT 708, 281,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "³�&��:" ,723 /*1091*/,205,126,30,10 - EDITTEXT 703, 234,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&��:" ,724 /*1092*/,202,140,34,10 - EDITTEXT 704, 234,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&��:" ,725 /*1093*/,196,154,37,10 - EDITTEXT 705, 234,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "��|��&��", 1090, 148, 147, 48, 10 + LTEXT "&��:", 726 /*1094*/,255,126,24,10 + EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&��:",727/*1095*/,252,140,24,10 + EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "�&��:",728 /*1096*/,254,154,24,10 + EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "³�&��:" ,723 /*1091*/,200,126,30,10 + EDITTEXT 703, 229,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&��:" ,724 /*1092*/,197,140,34,10 + EDITTEXT 704, 229,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&��:" ,725 /*1093*/,191,154,37,10 + EDITTEXT 705, 229,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,3,118,116 + CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,3,8,116 + CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,120,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "��", 1038,100,166, 44, 14 @@ -186,22 +186,22 @@ FONT 8, "MS Shell Dlg" } -FINDDLGORD DIALOG 36, 24, 245, 62 +FINDDLGORD DIALOG 36, 24, 236, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "��" FONT 8, "MS Shell Dlg" { LTEXT "&��:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 138, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "&�� ", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "�� &�崳��", 1041, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "��", 1072, 107, 26, 78, 28 - CONTROL "&��", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12 - CONTROL "�&��", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12 - - DEFPUSHBUTTON "�&�� ", IDOK, 190, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&��", pshHelp , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "�� &�崳��", 1041, 4, 42, 83, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "��", 1072, 107, 26, 68, 28 + CONTROL "&��", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 33, 12 + CONTROL "�&��", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 143, 38, 28, 12 + + DEFPUSHBUTTON "�&�� ", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "��", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&��", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP }

1 0

Alexandre Julliard : gdi32: Mirror the clip region when the DC is mirrored, with tests.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 7d776a866ea6a0a290f3e60fe7592d29245c31bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d776a866ea6a0a290f3e60fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 13:36:43 2010 +0200 gdi32: Mirror the clip region when the DC is mirrored, with tests. --- dlls/gdi32/clipping.c | 79 ++++++++++++++++++++++++++++++++------------ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/region.c | 57 +++++++++++++++++++++++++++++++ dlls/gdi32/tests/mapping.c | 55 ++++++++++++++++++++++++++++++ 4 files changed, 171 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d776a866ea6a0a290f3e…

1 0