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

Matteo Bruni : d3dx9: Add DEFB instruction support in the shader assembler.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 1371e71f6159cf27e5aae3523a7dd3544f0b551c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1371e71f6159cf27e5aae3523… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri May 14 17:21:42 2010 +0200 d3dx9: Add DEFB instruction support in the shader assembler. This completes vs_3_0 assembler language support. --- dlls/d3dx9_36/asmparser.c | 11 ++++++++ dlls/d3dx9_36/asmshader.l | 9 ++++++ dlls/d3dx9_36/asmshader.y | 7 +++++ dlls/d3dx9_36/asmutils.c | 2 + dlls/d3dx9_36/bytecodewriter.c | 51 +++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++ 6 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 68ee5ce..d1d75ba 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -48,6 +48,16 @@ static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float } } +static void asmparser_constB(struct asm_parser *This, DWORD reg, BOOL x) { + if(!This->shader) return; + TRACE("Adding boolean constant %u at pos %u\n", reg, This->shader->num_cb); + TRACE_(parsed_shader)("def b%u, %s\n", reg, x ? "true" : "false"); + if(!add_constB(This->shader, reg, x)) { + ERR("Out of memory\n"); + set_parse_status(This, PARSE_ERR); + } +} + static void asmparser_constI(struct asm_parser *This, DWORD reg, INT x, INT y, INT z, INT w) { if(!This->shader) return; TRACE("Adding integer constant %u at pos %u\n", reg, This->shader->num_ci); @@ -181,6 +191,7 @@ static void asmparser_coissue_unsupported(struct asm_parser *This) { static const struct asmparser_backend parser_vs_3 = { asmparser_constF, asmparser_constI, + asmparser_constB, asmparser_dstreg_vs_3, asmparser_srcreg_vs_3, diff --git a/dlls/d3dx9_36/asmshader.l b/dlls/d3dx9_36/asmshader.l index e8037f7..e65c6f9 100644 --- a/dlls/d3dx9_36/asmshader.l +++ b/dlls/d3dx9_36/asmshader.l @@ -139,6 +139,7 @@ m3x3 {return INSTR_M3x3; } m3x2 {return INSTR_M3x2; } dcl {return INSTR_DCL; } def {return INSTR_DEF; } +defb {return INSTR_DEFB; } defi {return INSTR_DEFI; } rep {return INSTR_REP; } endrep {return INSTR_ENDREP; } @@ -281,6 +282,14 @@ ps_3_0 {return VER_PS30; } asmshader_lval.immval.integer = ((strstr(yytext, ".") == NULL) && (strstr(yytext, "f") == NULL)); return IMMVAL; } +true { + asmshader_lval.immbool = TRUE; + return IMMBOOL; + } +false { + asmshader_lval.immbool = FALSE; + return IMMBOOL; + } {COMMA} {return yytext[0]; } - {return yytext[0]; } diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 5321ad8..f8dd716 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -60,6 +60,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { float val; BOOL integer; } immval; + BOOL immbool; unsigned int regnum; struct shader_reg reg; DWORD srcmod; @@ -124,6 +125,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %token INSTR_M3x2 %token INSTR_DCL %token INSTR_DEF +%token INSTR_DEFB %token INSTR_DEFI %token INSTR_REP %token INSTR_ENDREP @@ -226,6 +228,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { /* Misc stuff */ %token <component> COMPONENT %token <immval> IMMVAL +%token <immbool> IMMBOOL %type <reg> dreg_name %type <reg> dreg @@ -583,6 +586,10 @@ instruction: INSTR_ADD omods dreg ',' sregs { asm_ctx.funcs->constI(&asm_ctx, $2, $4.val, $6.val, $8.val, $10.val); } + | INSTR_DEFB REG_CONSTBOOL ',' IMMBOOL + { + asm_ctx.funcs->constB(&asm_ctx, $2, $4); + } | INSTR_REP sregs { TRACE("REP\n"); diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c index 52fc2d0..c5ef6c2 100644 --- a/dlls/d3dx9_36/asmutils.c +++ b/dlls/d3dx9_36/asmutils.c @@ -189,6 +189,7 @@ DWORD d3d9_opcode(DWORD bwriter_opcode) { case BWRITERSIO_BREAK: return D3DSIO_BREAK; case BWRITERSIO_BREAKC: return D3DSIO_BREAKC; case BWRITERSIO_MOVA: return D3DSIO_MOVA; + case BWRITERSIO_DEFB: return D3DSIO_DEFB; case BWRITERSIO_DEFI: return D3DSIO_DEFI; case BWRITERSIO_EXPP: return D3DSIO_EXPP; case BWRITERSIO_LOGP: return D3DSIO_LOGP; @@ -456,6 +457,7 @@ const char *debug_print_opcode(DWORD opcode) { case BWRITERSIO_BREAK: return "break"; case BWRITERSIO_BREAKC: return "breakc"; case BWRITERSIO_MOVA: return "mova"; + case BWRITERSIO_DEFB: return "defb"; case BWRITERSIO_DEFI: return "defi"; case BWRITERSIO_EXPP: return "expp"; case BWRITERSIO_LOGP: return "logp"; diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index c6bdfd0..087422f 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -176,6 +176,39 @@ BOOL add_constI(struct bwriter_shader *shader, DWORD reg, INT x, INT y, INT z, I return TRUE; } +BOOL add_constB(struct bwriter_shader *shader, DWORD reg, BOOL x) { + struct constant *newconst; + + if(shader->num_cb) { + struct constant **newarray; + newarray = asm_realloc(shader->constB, + sizeof(*shader->constB) * (shader->num_cb + 1)); + if(!newarray) { + ERR("Failed to grow the constants array\n"); + return FALSE; + } + shader->constB = newarray; + } else { + shader->constB = asm_alloc(sizeof(*shader->constB)); + if(!shader->constB) { + ERR("Failed to allocate the constants array\n"); + return FALSE; + } + } + + newconst = asm_alloc(sizeof(*newconst)); + if(!newconst) { + ERR("Failed to allocate a new constant\n"); + return FALSE; + } + newconst->regnum = reg; + newconst->value[0].b = x; + shader->constB[shader->num_cb] = newconst; + + shader->num_cb++; + return TRUE; +} + BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, DWORD usage_idx, BOOL output, DWORD regnum, DWORD writemask) { unsigned int *num; struct declaration **decl; @@ -343,7 +376,10 @@ static void write_const(struct constant **consts, int num, DWORD opcode, DWORD r D3DSP_WRITEMASK_ALL; if(len) { - instr_def |= 5 << D3DSI_INSTLENGTH_SHIFT; + if(opcode == D3DSIO_DEFB) + instr_def |= 2 << D3DSI_INSTLENGTH_SHIFT; + else + instr_def |= 5 << D3DSI_INSTLENGTH_SHIFT; } for(i = 0; i < num; i++) { @@ -352,9 +388,11 @@ static void write_const(struct constant **consts, int num, DWORD opcode, DWORD r put_dword(buffer, reg | (consts[i]->regnum & D3DSP_REGNUM_MASK)); put_dword(buffer, consts[i]->value[0].d); - put_dword(buffer, consts[i]->value[1].d); - put_dword(buffer, consts[i]->value[2].d); - put_dword(buffer, consts[i]->value[3].d); + if(opcode != D3DSIO_DEFB) { + put_dword(buffer, consts[i]->value[1].d); + put_dword(buffer, consts[i]->value[2].d); + put_dword(buffer, consts[i]->value[3].d); + } } } @@ -405,6 +443,10 @@ static void instr_handler(struct bc_writer *This, write_srcregs(This, instr, buffer); } +static void write_constB(const struct bwriter_shader *shader, struct bytecode_buffer *buffer, BOOL len) { + write_const(shader->constB, shader->num_cb, D3DSIO_DEFB, D3DSPR_CONSTBOOL, buffer, len); +} + static void write_constI(const struct bwriter_shader *shader, struct bytecode_buffer *buffer, BOOL len) { write_const(shader->constI, shader->num_ci, D3DSIO_DEFI, D3DSPR_CONSTINT, buffer, len); } @@ -449,6 +491,7 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); write_declarations(buffer, TRUE, shader->outputs, shader->num_outputs, D3DSPR_OUTPUT); write_constF(shader, buffer, TRUE); + write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); write_samplers(shader, buffer); return; diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 7aab8b1..a12cb99 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -255,6 +255,7 @@ struct src_regs { struct asmparser_backend { void (*constF)(struct asm_parser *This, DWORD reg, float x, float y, float z, float w); void (*constI)(struct asm_parser *This, DWORD reg, INT x, INT y, INT z, INT w); + void (*constB)(struct asm_parser *This, DWORD reg, BOOL x); void (*dstreg)(struct asm_parser *This, struct instruction *instr, const struct shader_reg *dst); @@ -283,6 +284,7 @@ struct instruction *alloc_instr(unsigned int srcs); BOOL add_instruction(struct bwriter_shader *shader, struct instruction *instr); BOOL add_constF(struct bwriter_shader *shader, DWORD reg, float x, float y, float z, float w); BOOL add_constI(struct bwriter_shader *shader, DWORD reg, INT x, INT y, INT z, INT w); +BOOL add_constB(struct bwriter_shader *shader, DWORD reg, BOOL x); BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, DWORD usage_idx, BOOL output, DWORD regnum, DWORD writemask); BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD regnum); @@ -442,6 +444,7 @@ typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { BWRITERSIO_BREAK, BWRITERSIO_BREAKC, BWRITERSIO_MOVA, + BWRITERSIO_DEFB, BWRITERSIO_DEFI, BWRITERSIO_EXPP,

1 0

Matteo Bruni : d3dx9: Add DEF instruction support in the shader assembler.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: dc1fa014ac59f635884c0aeb0117a31d26e1ab4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1fa014ac59f635884c0aeb0… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri May 14 17:21:42 2010 +0200 d3dx9: Add DEF instruction support in the shader assembler. --- dlls/d3dx9_36/asmparser.c | 12 +++++++ dlls/d3dx9_36/asmshader.l | 1 + dlls/d3dx9_36/asmshader.y | 5 +++ dlls/d3dx9_36/asmutils.c | 2 + dlls/d3dx9_36/bytecodewriter.c | 60 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 14 +++++++++ dlls/d3dx9_36/tests/asm.c | 6 ++++ 7 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 6d0d31f..a2d57e0 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -38,6 +38,16 @@ static void asmparser_end(struct asm_parser *This) { TRACE("Finalizing shader\n"); } +static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float y, float z, float w) { + if(!This->shader) return; + TRACE("Adding float constant %u at pos %u\n", reg, This->shader->num_cf); + TRACE_(parsed_shader)("def c%u, %f, %f, %f, %f\n", reg, x, y, z, w); + if(!add_constF(This->shader, reg, x, y, z, w)) { + ERR("Out of memory\n"); + set_parse_status(This, PARSE_ERR); + } +} + static void asmparser_dcl_output(struct asm_parser *This, DWORD usage, DWORD num, const struct shader_reg *reg) { if(!This->shader) return; @@ -159,6 +169,8 @@ static void asmparser_coissue_unsupported(struct asm_parser *This) { } static const struct asmparser_backend parser_vs_3 = { + asmparser_constF, + asmparser_dstreg_vs_3, asmparser_srcreg_vs_3, diff --git a/dlls/d3dx9_36/asmshader.l b/dlls/d3dx9_36/asmshader.l index 9486b53..690a5a7 100644 --- a/dlls/d3dx9_36/asmshader.l +++ b/dlls/d3dx9_36/asmshader.l @@ -138,6 +138,7 @@ m3x4 {return INSTR_M3x4; } m3x3 {return INSTR_M3x3; } m3x2 {return INSTR_M3x2; } dcl {return INSTR_DCL; } +def {return INSTR_DEF; } rep {return INSTR_REP; } endrep {return INSTR_ENDREP; } if {return INSTR_IF; } diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index a6ab57e..bb4c43f 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -123,6 +123,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %token INSTR_M3x3 %token INSTR_M3x2 %token INSTR_DCL +%token INSTR_DEF %token INSTR_REP %token INSTR_ENDREP %token INSTR_IF @@ -573,6 +574,10 @@ instruction: INSTR_ADD omods dreg ',' sregs asm_ctx.line_no); set_parse_status(&asm_ctx, PARSE_WARN); } + | INSTR_DEF REG_CONSTFLOAT ',' IMMVAL ',' IMMVAL ',' IMMVAL ',' IMMVAL + { + asm_ctx.funcs->constF(&asm_ctx, $2, $4.val, $6.val, $8.val, $10.val); + } | INSTR_REP sregs { TRACE("REP\n"); diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c index c34f5f5..3772c5f 100644 --- a/dlls/d3dx9_36/asmutils.c +++ b/dlls/d3dx9_36/asmutils.c @@ -191,6 +191,7 @@ DWORD d3d9_opcode(DWORD bwriter_opcode) { case BWRITERSIO_MOVA: return D3DSIO_MOVA; case BWRITERSIO_EXPP: return D3DSIO_EXPP; case BWRITERSIO_LOGP: return D3DSIO_LOGP; + case BWRITERSIO_DEF: return D3DSIO_DEF; case BWRITERSIO_SETP: return D3DSIO_SETP; case BWRITERSIO_TEXLDL: return D3DSIO_TEXLDL; case BWRITERSIO_BREAKP: return D3DSIO_BREAKP; @@ -456,6 +457,7 @@ const char *debug_print_opcode(DWORD opcode) { case BWRITERSIO_MOVA: return "mova"; case BWRITERSIO_EXPP: return "expp"; case BWRITERSIO_LOGP: return "logp"; + case BWRITERSIO_DEF: return "def"; case BWRITERSIO_SETP: return "setp"; case BWRITERSIO_TEXLDL: return "texldl"; case BWRITERSIO_BREAKP: return "breakp"; diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index 82a3655..c14f022 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -104,6 +104,42 @@ BOOL add_instruction(struct bwriter_shader *shader, struct instruction *instr) { return TRUE; } +BOOL add_constF(struct bwriter_shader *shader, DWORD reg, float x, float y, float z, float w) { + struct constant *newconst; + + if(shader->num_cf) { + struct constant **newarray; + newarray = asm_realloc(shader->constF, + sizeof(*shader->constF) * (shader->num_cf + 1)); + if(!newarray) { + ERR("Failed to grow the constants array\n"); + return FALSE; + } + shader->constF = newarray; + } else { + shader->constF = asm_alloc(sizeof(*shader->constF)); + if(!shader->constF) { + ERR("Failed to allocate the constants array\n"); + return FALSE; + } + } + + newconst = asm_alloc(sizeof(*newconst)); + if(!newconst) { + ERR("Failed to allocate a new constant\n"); + return FALSE; + } + newconst->regnum = reg; + newconst->value[0].f = x; + newconst->value[1].f = y; + newconst->value[2].f = z; + newconst->value[3].f = w; + shader->constF[shader->num_cf] = newconst; + + shader->num_cf++; + return TRUE; +} + BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, DWORD usage_idx, BOOL output, DWORD regnum, DWORD writemask) { unsigned int *num; struct declaration **decl; @@ -262,6 +298,29 @@ static void write_declarations(struct bytecode_buffer *buffer, BOOL len, } } +static void write_constF(const struct bwriter_shader *shader, struct bytecode_buffer *buffer, BOOL len) { + DWORD i; + DWORD instr_def = D3DSIO_DEF; + const DWORD reg = (1<<31) | + ((D3DSPR_CONST << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK) | + D3DSP_WRITEMASK_ALL; + + if(len) { + instr_def |= 5 << D3DSI_INSTLENGTH_SHIFT; + } + + for(i = 0; i < shader->num_cf; i++) { + /* Write the DEF instruction */ + put_dword(buffer, instr_def); + + put_dword(buffer, reg | (shader->constF[i]->regnum & D3DSP_REGNUM_MASK)); + put_dword(buffer, shader->constF[i]->value[0].d); + put_dword(buffer, shader->constF[i]->value[1].d); + put_dword(buffer, shader->constF[i]->value[2].d); + put_dword(buffer, shader->constF[i]->value[3].d); + } +} + static void end(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer) { put_dword(buffer, D3DSIO_END); } @@ -344,6 +403,7 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); write_declarations(buffer, TRUE, shader->outputs, shader->num_outputs, D3DSPR_OUTPUT); + write_constF(shader, buffer, TRUE); write_samplers(shader, buffer); return; } diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index a102e65..c20119a 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -146,6 +146,16 @@ typedef enum BWRITER_COMPARISON_TYPE { BWRITER_COMPARISON_LE } BWRITER_COMPARISON_TYPE; +struct constant { + DWORD regnum; + union { + float f; + INT i; + BOOL b; + DWORD d; + } value[4]; +}; + struct shader_reg { DWORD type; DWORD regnum; @@ -243,6 +253,8 @@ struct src_regs { }; struct asmparser_backend { + void (*constF)(struct asm_parser *This, DWORD reg, float x, float y, float z, float w); + void (*dstreg)(struct asm_parser *This, struct instruction *instr, const struct shader_reg *dst); void (*srcreg)(struct asm_parser *This, struct instruction *instr, int num, @@ -268,6 +280,7 @@ struct asmparser_backend { struct instruction *alloc_instr(unsigned int srcs); BOOL add_instruction(struct bwriter_shader *shader, struct instruction *instr); +BOOL add_constF(struct bwriter_shader *shader, DWORD reg, float x, float y, float z, float w); BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, DWORD usage_idx, BOOL output, DWORD regnum, DWORD writemask); BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD regnum); @@ -430,6 +443,7 @@ typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { BWRITERSIO_EXPP, BWRITERSIO_LOGP, + BWRITERSIO_DEF, BWRITERSIO_SETP, BWRITERSIO_TEXLDL, BWRITERSIO_BREAKP, diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 21adb81..8a79dd4 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1074,6 +1074,12 @@ static void vs_3_0_test(void) { "sincos r0, r1\n", {0xfffe0300, 0x02000025, 0x800f0000, 0x80e40001, 0x0000ffff} }, + { /* shader 13 */ + "vs_3_0\n" + "def c0, 1.0f, 1.0f, 1.0f, 0.5f\n", + {0xfffe0300, 0x05000051, 0xa00f0000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f000000, 0x0000ffff} + }, }; exec_tests("vs_3_0", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Mike Kaplinskiy : ws2_32/tests: fix test failures on wine and win98.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: ebf20d6645c5ef2ce38ac8a721317fead0463272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf20d6645c5ef2ce38ac8a72… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat May 15 01:18:30 2010 -0400 ws2_32/tests: fix test failures on wine and win98. --- dlls/ws2_32/tests/sock.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4ac338c..882bf22 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3279,7 +3279,7 @@ static void test_events(int useMessages) ret = recv(src, buffer, 1, 0); ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError()); /* want it? it's here, but you can't have it */ - broken_seq[0] = read_close_seq; /* win9x */ + broken_seq[0] = close_seq; /* win9x */ broken_seq[1] = NULL; todo_wine ok_event_seq(src, hEvent, empty_seq, /* wine sends FD_CLOSE here */ broken_seq, 0); @@ -4092,7 +4092,6 @@ START_TEST( sock ) test_dns(); test_gethostbyname_hack(); - test_send(); test_WSASendTo(); test_WSARecv(); @@ -4104,5 +4103,8 @@ START_TEST( sock ) test_AcceptEx(); + /* this is a io heavy test, do it at the end so the kernel doesn't start dropping packets */ + test_send(); + Exit(); }

1 0

Octavian Voicu : d3dx9_36: Export D3DXCreateEffectEx stub.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 8921d8c730693a140350717184e3776507ac29d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8921d8c730693a14035071718… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Sat May 15 15:24:16 2010 +0300 d3dx9_36: Export D3DXCreateEffectEx stub. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 8b2796a..d2437b8 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -52,7 +52,7 @@ @ stub D3DXCreateEffectCompilerFromFileW @ stub D3DXCreateEffectCompilerFromResourceA @ stub D3DXCreateEffectCompilerFromResourceW -@ stub D3DXCreateEffectEx +@ stdcall D3DXCreateEffectEx(ptr ptr long ptr ptr ptr long ptr ptr ptr) @ stub D3DXCreateEffectFromFileA @ stub D3DXCreateEffectFromFileExA @ stub D3DXCreateEffectFromFileExW

1 0

Alexandre Julliard : ntdll: Avoid a compiler warning on NetBSD.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: d0093f0055e496769b496226cdaa547de7375611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0093f0055e496769b496226c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 16 17:55:31 2010 +0200 ntdll: Avoid a compiler warning on NetBSD. --- dlls/ntdll/cdrom.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index ab68459..0737e6e 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -610,20 +610,21 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi struct scsi_addr addr; if (ioctl(fd, SCIOCIDENTIFY, &addr) != -1) { - switch (addr.type) + switch (addr.type) { - case TYPE_SCSI: *port = 1; + case TYPE_SCSI: + *port = 1; *iface = addr.addr.scsi.scbus; *device = addr.addr.scsi.target; *lun = addr.addr.scsi.lun; - break; - case TYPE_ATAPI: *port = 0; + return 1; + case TYPE_ATAPI: + *port = 0; *iface = addr.addr.atapi.atbus; *device = addr.addr.atapi.drive; *lun = 0; - break; + return 1; } - return 1; } return 0; #elif defined(__FreeBSD__)

1 0

Gerald Pfeifer : rpcrt4: Remove variable hr which is not really used from NdrInterfacePointerBufferSize .
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 2f4c5cf351bc26a7ce755e8a4846f3bc39b1d143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4c5cf351bc26a7ce755e8a4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 14 22:06:47 2010 +0200 rpcrt4: Remove variable hr which is not really used from NdrInterfacePointerBufferSize. --- dlls/rpcrt4/ndr_ole.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index a4c23c2..090be05 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -309,13 +309,12 @@ void WINAPI NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, { const IID *riid = get_ip_iid(pStubMsg, pMemory, pFormat); ULONG size = 0; - HRESULT hr; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); if (!LoadCOM()) return; - hr = COM_GetMarshalSizeMax(&size, riid, (LPUNKNOWN)pMemory, - pStubMsg->dwDestContext, pStubMsg->pvDestContext, - MSHLFLAGS_NORMAL); + COM_GetMarshalSizeMax(&size, riid, (LPUNKNOWN)pMemory, + pStubMsg->dwDestContext, pStubMsg->pvDestContext, + MSHLFLAGS_NORMAL); TRACE("size=%d\n", size); pStubMsg->BufferLength += sizeof(DWORD) + size; }

1 0

Rico Schüller : d3d10: Add argument check to ID3D10Effect::GetTechniqueByName().
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: af93f1ab33cf0802b77bfc4177893e84be38e358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af93f1ab33cf0802b77bfc417… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat May 15 22:04:02 2010 +0200 d3d10: Add argument check to ID3D10Effect::GetTechniqueByName(). --- dlls/d3d10/effect.c | 8 ++++++++ dlls/d3d10/tests/effect.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9a6c843..43b94f3 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2299,6 +2299,12 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + if (!name) + { + WARN("Invalid name specified\n"); + return (ID3D10EffectTechnique *)&null_technique; + } + for (i = 0; i < This->technique_count; ++i) { struct d3d10_effect_technique *t = &This->techniques[i]; @@ -2458,6 +2464,8 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + /* Do not check for name==NULL, W7/DX10 crashes in that case. */ + for (i = 0; i < This->pass_count; ++i) { struct d3d10_effect_pass *p = &This->passes[i]; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index f37f945..a8c5886 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2648,8 +2648,8 @@ static void test_effect_local_shader(ID3D10Device *device) BOOL ret; ID3D10Effect* effect; ID3D10EffectVariable* v; - ID3D10EffectPass *p, *null_pass; - ID3D10EffectTechnique *t; + ID3D10EffectPass *p, *p2, *null_pass; + ID3D10EffectTechnique *t, *t2, *null_technique; D3D10_PASS_SHADER_DESC pdesc = {0}; D3D10_EFFECT_VARIABLE_DESC vdesc = {0}; ID3D10EffectType *type; @@ -2660,8 +2660,37 @@ static void test_effect_local_shader(ID3D10Device *device) hr = create_effect(fx_local_shader, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed!\n"); + null_technique = effect->lpVtbl->GetTechniqueByIndex(effect, 0xffffffff); + null_pass = null_technique->lpVtbl->GetPassByIndex(null_technique, 0xffffffff); + + /* check technique */ + t = effect->lpVtbl->GetTechniqueByName(effect, NULL); + ok(null_technique == t, "GetTechniqueByName got %p, expected %p\n", t, null_technique); + + t = effect->lpVtbl->GetTechniqueByName(effect, "invalid"); + ok(null_technique == t, "GetTechniqueByName got %p, expected %p\n", t, null_technique); + t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); - null_pass = t->lpVtbl->GetPassByIndex(t, 10000); + ok(null_technique != t, "GetTechniqueByIndex failed %p\n", t); + + t2 = effect->lpVtbl->GetTechniqueByName(effect, "Render"); + ok(t2 == t, "GetTechniqueByName got %p, expected %p\n", t2, t); + + /* check invalid pass arguments */ + p = null_technique->lpVtbl->GetPassByName(null_technique, NULL); + ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); + + p = null_technique->lpVtbl->GetPassByName(null_technique, "invalid"); + ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); + +#if 0 + /* This crashes on W7/DX10, if t is a valid technique and name=NULL. */ + p = t->lpVtbl->GetPassByName(t, NULL); + ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); +#endif + + p = t->lpVtbl->GetPassByIndex(t, 0xffffffff); + ok(null_pass == p, "GetPassByIndex got %p, expected %p\n", p, null_pass); /* check for invalid arguments */ hr = null_pass->lpVtbl->GetVertexShaderDesc(null_pass, NULL); @@ -2682,9 +2711,13 @@ static void test_effect_local_shader(ID3D10Device *device) hr = null_pass->lpVtbl->GetGeometryShaderDesc(null_pass, &pdesc); ok(hr == E_FAIL, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_FAIL); + /* check valid pass arguments */ t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); p = t->lpVtbl->GetPassByIndex(t, 0); + p2 = t->lpVtbl->GetPassByName(t, "P0"); + ok(p2 == p, "GetPassByName got %p, expected %p\n", p2, p); + hr = p->lpVtbl->GetVertexShaderDesc(p, NULL); ok(hr == E_INVALIDARG, "GetVertexShaderDesc got %x, expected %x\n", hr, E_INVALIDARG);

1 0

Gerald Pfeifer : riched20: Remove variables yprev and ys which are not really used from ME_ArrowPageUp .
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: f772c799ae0f4a025a3a6d44a8565a9477bb2a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f772c799ae0f4a025a3a6d44a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 14 22:04:32 2010 +0200 riched20: Remove variables yprev and ys which are not really used from ME_ArrowPageUp. --- dlls/riched20/caret.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 930fb14..5750db9 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1354,7 +1354,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) } else { ME_DisplayItem *pRun = pCursor->pRun; ME_DisplayItem *pLast; - int x, y, ys, yd, yp, yprev; + int x, y, yd, yp; int yOldScrollPos = editor->vert_si.nPos; x = ME_GetXForArrow(editor, pCursor); @@ -1364,7 +1364,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) p = ME_FindItemBack(pRun, diStartRowOrParagraph); assert(p->type == diStartRow); yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; - yprev = ys = y = yp + p->member.row.pt.y; + y = yp + p->member.row.pt.y; ME_ScrollUp(editor, editor->sizeWindow.cy); /* Only move the cursor by the amount scrolled. */ @@ -1385,7 +1385,6 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) if (y < yd) break; pLast = p; - yprev = y; } while(1); pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset,

1 0

Michael Stefaniuc : comdlg32: The Dutch translation uses UTF-8.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 1f13973e8516684e229a51ca6789770558035886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f13973e8516684e229a51ca6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 14 22:35:48 2010 +0200 comdlg32: The Dutch translation uses UTF-8. --- dlls/comdlg32/cdlg_Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index b883a05..8f29a59 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -26,6 +26,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Bestand openen"

1 0

Dylan Smith : richedit: Avoid notifying parent window in improper state.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 049cf5aca0a2daafe0ce078757ad60f1a1cadc9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=049cf5aca0a2daafe0ce07875… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri May 14 20:11:28 2010 -0400 richedit: Avoid notifying parent window in improper state. ME_CommitUndo and ME_CommitCoalescingUndo call ME_SendSelChange, which may notify the parent window that the selection has changed, therefore should generally be called after wrapping the text. Otherwise, the parent window may send a message to the editor and cause an assertion failure. --- dlls/riched20/editor.c | 50 +++++++++++++++++++++++++++++----------------- dlls/riched20/richole.c | 2 +- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 531fae1..591f9ff 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -317,8 +317,8 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea break; stream->dwSize = 0; } while(1); - ME_CommitUndo(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); return 0; } @@ -2105,10 +2105,16 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return TRUE; case VK_BACK: case VK_DELETE: + { + int saved_nEventMask; editor->nUDArrowX = -1; /* FIXME backspace and delete aren't the same, they act different wrt paragraph style of the merged paragraph */ if (editor->styleFlags & ES_READONLY) return FALSE; + /* Prevent calling ME_SendSelChange until after wrapping the + * text due to text deletion. */ + saved_nEventMask = editor->nEventMask; + editor->nEventMask = 0; if (ME_IsSelection(editor)) { ME_DeleteSelection(editor); @@ -2136,12 +2142,18 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_CommitCoalescingUndo(editor); } else + { + editor->nEventMask = saved_nEventMask; return TRUE; + } + editor->nEventMask = saved_nEventMask; ME_MoveCursorFromTableRowStartParagraph(editor); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); + ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE); return TRUE; + } case VK_RETURN: if (editor->bDialogMode) { @@ -2193,9 +2205,9 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_CommitUndo(editor); ME_CheckTablesForCorruption(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); return TRUE; } else if (para == editor->pCursors[1].pPara && @@ -2218,9 +2230,9 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[1] = editor->pCursors[0]; para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; - ME_CommitCoalescingUndo(editor); ME_CheckTablesForCorruption(editor); ME_UpdateRepaint(editor); + ME_CommitCoalescingUndo(editor); return TRUE; } } else { /* v1.0 - 3.0 */ @@ -2236,8 +2248,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_CommitCoalescingUndo(editor); ME_UpdateRepaint(editor); + ME_CommitCoalescingUndo(editor); return TRUE; } } else { @@ -2263,8 +2275,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; } - ME_CommitCoalescingUndo(editor); ME_UpdateRepaint(editor); + ME_CommitCoalescingUndo(editor); return TRUE; } } @@ -2278,11 +2290,11 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) else ME_InsertTextFromCursor(editor, 0, &endl, 1, style); ME_ReleaseStyle(style); - ME_CommitCoalescingUndo(editor); SetCursor(NULL); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); + ME_CommitCoalescingUndo(editor); } return TRUE; } @@ -2320,8 +2332,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) if (result && nKey == 'X') { ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_CommitUndo(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); } return result; } @@ -2446,12 +2458,12 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, ME_ContinueCoalescingTransaction(editor); ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); - ME_CommitCoalescingUndo(editor); ITextHost_TxSetCursor(editor->texthost, NULL, FALSE); } ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); + ME_CommitCoalescingUndo(editor); } return 0; } @@ -3295,13 +3307,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetCursorToStart(editor, &cursor); ME_UpdateLinkAttribute(editor, &cursor, INT_MAX); } + ME_UpdateRepaint(editor); ME_CommitUndo(editor); if (!(pStruct->flags & ST_KEEPUNDO)) { editor->nModifyStep = oldModify; ME_EmptyUndoStack(editor); } - ME_UpdateRepaint(editor); return len; } case EM_SETBKGNDCOLOR: @@ -3382,13 +3394,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetSelectionCharFormat(editor, p); if (bRepaint) editor->nModifyStep = 1; } - ME_CommitUndo(editor); if (bRepaint) { ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); ME_Repaint(editor); } + ME_CommitUndo(editor); return 1; } case EM_GETCHARFORMAT: @@ -3461,8 +3473,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int from, to; int nStartCursor = ME_GetSelectionOfs(editor, &from, &to); ME_InternalDeleteText(editor, &editor->pCursors[nStartCursor], to-from, FALSE); - ME_CommitUndo(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); return 0; } case EM_REPLACESEL: @@ -3486,11 +3498,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (len>0 && wszText[len-1] == '\n') ME_ClearTempStyle(editor); ME_EndToUnicode(unicode, wszText); - ME_CommitUndo(editor); ME_UpdateSelectionLinkAttribute(editor); + ME_UpdateRepaint(editor); + ME_CommitUndo(editor); if (!wParam) ME_EmptyUndoStack(editor); - ME_UpdateRepaint(editor); return len; } case EM_SCROLLCARET: @@ -3514,10 +3526,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetCharFormat(editor, &start, NULL, &fmt); ME_SetDefaultCharFormat(editor, &fmt); - ME_CommitUndo(editor); ME_MarkAllForWrapping(editor); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); + ME_CommitUndo(editor); if (bRepaint) ME_Repaint(editor); return 0; @@ -3564,9 +3576,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_UpdateLinkAttribute(editor, &cursor, INT_MAX); ME_SetSelection(editor, 0, 0); editor->nModifyStep = 0; + ME_UpdateRepaint(editor); ME_CommitUndo(editor); ME_EmptyUndoStack(editor); - ME_UpdateRepaint(editor); return 1; } case EM_CANPASTE: @@ -3591,8 +3603,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (ME_Copy(editor, selStart, nChars) && msg == WM_CUT) { ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_CommitUndo(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); } return 0; } @@ -3927,9 +3939,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } - ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); ME_MoveCaret(editor); + ME_CommitUndo(editor); return 0; } case WM_DESTROY: @@ -4245,8 +4257,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); - ME_CommitUndo(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); return 0; } case WM_IME_COMPOSITION: @@ -4256,7 +4268,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_Style *style = ME_GetInsertStyle(editor, 0); hIMC = ITextHost_TxImmGetContext(editor->texthost); ME_DeleteSelection(editor); - ME_CommitUndo(editor); ME_SaveTempStyle(editor); if (lParam & GCS_RESULTSTR) { @@ -4285,6 +4296,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } ME_ReleaseStyle(style); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); return 0; } case WM_IME_ENDCOMPOSITION: diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5b6b2b6..e9712b6 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -390,8 +390,8 @@ IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *reo) if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; ME_InsertOLEFromCursor(This->editor, reo, 0); - ME_CommitUndo(This->editor); ME_UpdateRepaint(This->editor); + ME_CommitUndo(This->editor); return S_OK; }

1 0