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

Stefan Dösinger : wined3d: Support vec4 A0 with NV_vertex_program2_option.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 8e45e48b0cc387c99ae8e1865b6eb2821b690114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e45e48b0cc387c99ae8e1865… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 8 18:14:34 2009 +0200 wined3d: Support vec4 A0 with NV_vertex_program2_option. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 63dd81e..79c3b95 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -45,8 +45,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); static BOOL need_mova_const(IWineD3DBaseShader *shader, const WineD3D_GL_Info *gl_info) { IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) shader; if(!This->baseShader.reg_maps.usesmova) return FALSE; - /* TODO: ARR from GL_NV_vertex_program2_option */ - return TRUE; + return !GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); } static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { @@ -536,6 +535,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction static const char * const rastout_reg_names[] = {"TMP_OUT", "result.fogcoord", "result.pointsize"}; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; BOOL pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); + struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; *is_color = FALSE; @@ -567,9 +567,10 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction sprintf(rel_reg, "A0.x"); } else { shader_arb_get_src_param(ins, reg->rel_addr, 0, rel_reg); - /* FIXME: GL_NV_vertex_progam2_option */ - shader_arb_request_a0(ins, rel_reg); - sprintf(rel_reg, "A0.x"); + if(ctx->target_version == ARB) { + shader_arb_request_a0(ins, rel_reg); + sprintf(rel_reg, "A0.x"); + } } if (reg->idx >= rel_offset) sprintf(register_name, "C[%s + %u]", rel_reg, reg->idx - rel_offset); @@ -601,7 +602,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if(This->baseShader.reg_maps.shader_version.major == 1) + if(This->baseShader.reg_maps.shader_version.major == 1 || ctx->target_version >= NV2) { sprintf(register_name, "A%u", reg->idx); } @@ -1036,6 +1037,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_SGE: instruction = "SGE"; break; case WINED3DSIH_SLT: instruction = "SLT"; break; case WINED3DSIH_SUB: instruction = "SUB"; break; + case WINED3DSIH_MOVA:instruction = "ARR"; break; default: instruction = ""; FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; @@ -1068,9 +1070,14 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) char src0_param[256]; if(ins->handler_idx == WINED3DSIH_MOVA) { + struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; struct wined3d_shader_src_param tmp_src = ins->src[0]; char write_mask[6]; + if(ctx->target_version >= NV2) { + shader_hw_map2gl(ins); + return; + } tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); shader_arb_get_write_mask(ins, &ins->dst[0], write_mask); @@ -1084,8 +1091,6 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) * * The ARL is performed when A0 is used - the requested component is read from A0_SHADOW into * A0.x. We can use the overwritten component of A0_shadow as temporary storage for the sign. - * - * TODO: ARR from GL_NV_vertex_program2_option */ shader_addline(buffer, "SGE A0_SHADOW%s, %s, mova_const.y;\n", write_mask, src0_param); shader_addline(buffer, "MAD A0_SHADOW%s, A0_SHADOW, mova_const.z, -mova_const.w;\n", write_mask);

1 0

Stefan Dösinger : wined3d: Support ABS and ABSNEG in ARB.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 60f20a2f3971038bc02162cf7e23ed8dda9e71fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f20a2f3971038bc02162cf7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 21 11:58:20 2009 +0200 wined3d: Support ABS and ABSNEG in ARB. --- dlls/wined3d/arb_program_shader.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d871fc9..6c74169 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -850,6 +850,14 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in shader_addline(buffer, "RCP T%c, %s.w;\n", 'A' + tmpreg, regstr); shader_addline(buffer, "MUL T%c, %s, T%c;\n", 'A' + tmpreg, regstr, 'A' + tmpreg); break; + case WINED3DSPSM_ABS: + shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); + break; + case WINED3DSPSM_ABSNEG: + shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); + sprintf(outregstr, "-T%c%s", 'A' + tmpreg, swzstr); + insert_line = 0; + break; default: sprintf(outregstr, "%s%s", regstr, swzstr); insert_line = 0;

1 0

Stefan Dösinger : wined3d: Add NV asm extension support to the ARB backend.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 01ec5068e2d3451610878b9b0ae985d16d605a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ec5068e2d3451610878b9b0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 8 18:02:27 2009 +0200 wined3d: Add NV asm extension support to the ARB backend. --- dlls/wined3d/arb_program_shader.c | 25 ++++++++++++++++++++++++- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 9 +++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6c74169..7e56175 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -86,6 +86,14 @@ struct shader_arb_priv { struct shader_arb_ctx_priv { char addr_reg[20]; + enum { + /* plain GL_ARB_vertex_program or GL_ARB_fragment_program */ + ARB, + /* GL_NV_vertex_progam2_option or GL_NV_fragment_program_option */ + NV2, + /* GL_NV_vertex_program3 or GL_NV_fragment_program2 */ + NV3 + } target_version; }; /******************************************************** @@ -1979,9 +1987,17 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, GLuint retval; const char *fragcolor; DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); + struct shader_arb_ctx_priv priv_ctx; /* Create the hw ARB shader */ + memset(&priv_ctx, 0, sizeof(priv_ctx)); shader_addline(buffer, "!!ARBfp1.0\n"); + if(GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { + shader_addline(buffer, "OPTION NV_fragment_program;\n"); + priv_ctx.target_version = NV2; + } else { + priv_ctx.target_version = ARB; + } if (reg_maps->shader_version.major < 3) { @@ -2023,7 +2039,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, NULL); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); @@ -2083,6 +2099,13 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); + if(GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) { + shader_addline(buffer, "OPTION NV_vertex_program2;\n"); + priv_ctx.target_version = NV2; + } else { + priv_ctx.target_version = ARB; + } + if(need_helper_const(gl_info)) { shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 94c5f6a..46c1556 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -140,7 +140,9 @@ static const struct { {"GL_NV_vertex_program", NV_VERTEX_PROGRAM, 0 }, {"GL_NV_vertex_program1_1", NV_VERTEX_PROGRAM1_1, 0 }, {"GL_NV_vertex_program2", NV_VERTEX_PROGRAM2, 0 }, + {"GL_NV_vertex_program2_option", NV_VERTEX_PROGRAM2_OPTION, 0 }, {"GL_NV_vertex_program3", NV_VERTEX_PROGRAM3, 0 }, + {"GL_NV_fragment_program_option", NV_FRAGMENT_PROGRAM_OPTION, 0 }, {"GL_NV_depth_clamp", NV_DEPTH_CLAMP, 0 }, {"GL_NV_light_max_exponent", NV_LIGHT_MAX_EXPONENT, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 1a615c1..a36d9c5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3080,6 +3080,13 @@ typedef void (WINE_GLAPI *PGLFNSETFRAGMENTSHADERCONSTANTATI) (GLuint dst, const #define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE #endif +/* GL_NV_vertex_program2_option */ +#ifndef GL_NV_vertex_program2_option +#define GL_NV_vertex_program2_option +#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 +#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 +#endif + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -3450,7 +3457,9 @@ typedef enum _GL_SupportedExt { NV_VERTEX_PROGRAM, NV_VERTEX_PROGRAM1_1, NV_VERTEX_PROGRAM2, + NV_VERTEX_PROGRAM2_OPTION, NV_VERTEX_PROGRAM3, + NV_FRAGMENT_PROGRAM_OPTION, NV_FENCE, NV_DEPTH_CLAMP, NV_LIGHT_MAX_EXPONENT,

1 0

Stefan Dösinger : wined3d: Support ABS and ABSNEG with NV extensions if available.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: d0756ee537514795d20486809900f29933c4181a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0756ee537514795d20486809… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 21 12:00:16 2009 +0200 wined3d: Support ABS and ABSNEG with NV extensions if available. --- dlls/wined3d/arb_program_shader.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7e56175..63dd81e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -811,6 +811,7 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in char swzstr[20]; int insert_line; SHADER_BUFFER *buffer = ins->ctx->buffer; + struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; /* Assume a new line will be added */ insert_line = 1; @@ -859,11 +860,20 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in shader_addline(buffer, "MUL T%c, %s, T%c;\n", 'A' + tmpreg, regstr, 'A' + tmpreg); break; case WINED3DSPSM_ABS: - shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); + if(ctx->target_version >= NV2) { + sprintf(outregstr, "|%s%s|", regstr, swzstr); + insert_line = 0; + } else { + shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); + } break; case WINED3DSPSM_ABSNEG: - shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); - sprintf(outregstr, "-T%c%s", 'A' + tmpreg, swzstr); + if(ctx->target_version >= NV2) { + sprintf(outregstr, "-|%s%s|", regstr, swzstr); + } else { + shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); + sprintf(outregstr, "-T%c%s", 'A' + tmpreg, swzstr); + } insert_line = 0; break; default:

1 0

Vincent Povirk : winex11.drv: Use the proper enum value for repeat.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 603675d0d4417a3ed512b1f9deebe0a2d20210dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=603675d0d4417a3ed512b1f9d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 20 11:22:41 2009 -0500 winex11.drv: Use the proper enum value for repeat. --- dlls/winex11.drv/xrender.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index f8f3ba9..c00601c 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -47,6 +47,12 @@ static BOOL X11DRV_XRender_Installed = FALSE; #include <X11/Xlib.h> #include <X11/extensions/Xrender.h> +#ifndef RepeatNone /* added in 0.10 */ +#define RepeatNone 0 +#define RepeatNormal 1 +#define RepeatPad 2 +#define RepeatReflect 3 +#endif enum drawable_depth_type {mono_drawable, color_drawable}; static XRenderPictFormat *pict_formats[2]; @@ -1166,7 +1172,7 @@ static Picture get_tile_pict(enum drawable_depth_type type, int text_pixel) wine_tsx11_lock(); tile->xpm = XCreatePixmap(gdi_display, root_window, 1, 1, pict_formats[type]->depth); - pa.repeat = True; + pa.repeat = RepeatNormal; tile->pict = pXRenderCreatePicture(gdi_display, tile->xpm, pict_formats[type], CPRepeat, &pa); wine_tsx11_unlock();

1 0

Vincent Povirk : winex11.drv: Optimize AlphaBlend of 1x1 source bitmaps.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 9eaf6a29fe1e8c0a3d346996fe89d67aba8a43a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eaf6a29fe1e8c0a3d346996f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 20 11:23:38 2009 -0500 winex11.drv: Optimize AlphaBlend of 1x1 source bitmaps. --- dlls/winex11.drv/xrender.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index c00601c..afe60cd 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1631,6 +1631,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid BOOL top_down = FALSE; RGNDATA *rgndata; enum drawable_depth_type dst_depth_type = (devDst->depth == 1) ? mono_drawable : color_drawable; + int repeat_src; if(!X11DRV_XRender_Installed) { FIXME("Unable to AlphaBlend without Xrender\n"); @@ -1657,10 +1658,14 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid heightSrc = pts[1].y - pts[0].y; if (!widthDst || !heightDst || !widthSrc || !heightSrc) return TRUE; + /* If the source is a 1x1 bitmap, tiling is equivalent to stretching, but + tiling is much faster. Therefore, we do no stretching in this case. */ + repeat_src = widthSrc == 1 && heightSrc == 1; + #ifndef HAVE_XRENDERSETPICTURETRANSFORM - if(widthDst != widthSrc || heightDst != heightSrc) + if((widthDst != widthSrc || heightDst != heightSrc) && !repeat_src) #else - if(!pXRenderSetPictureTransform) + if(!pXRenderSetPictureTransform && !repeat_src) #endif { FIXME("Unable to Stretch, XRenderSetPictureTransform is currently required\n"); @@ -1751,6 +1756,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid TRACE("src_format %p\n", src_format); pa.subwindow_mode = IncludeInferiors; + pa.repeat = repeat_src ? RepeatNormal : RepeatNone; /* FIXME use devDst->xrender->pict ? */ dst_pict = pXRenderCreatePicture(gdi_display, @@ -1769,7 +1775,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid src_pict = pXRenderCreatePicture(gdi_display, xpm, src_format, - CPSubwindowMode, &pa); + CPSubwindowMode|CPRepeat, &pa); TRACE("src_pict %08lx\n", src_pict); if (rgndata) @@ -1782,7 +1788,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid } #ifdef HAVE_XRENDERSETPICTURETRANSFORM - if(widthDst != widthSrc || heightDst != heightSrc) { + if(!repeat_src && (widthDst != widthSrc || heightDst != heightSrc)) { double xscale = widthSrc/(double)widthDst; double yscale = heightSrc/(double)heightDst; XTransform xform = {{

1 0

Aric Stewart : msctf: Beginning of TfEditCookie definition and usage.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: a5006e7eb4def547c24ab17c129605bc72b53e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5006e7eb4def547c24ab17c1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 20 14:46:44 2009 -0500 msctf: Beginning of TfEditCookie definition and usage. --- dlls/msctf/context.c | 33 +++++++++++++++++++++++++++++---- dlls/msctf/msctf_internal.h | 1 + 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 6f35def..297f611 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -69,6 +69,7 @@ typedef struct tagContext { BOOL connected; TfClientId tidOwner; + TfEditCookie defaultCookie; ITextStoreACP *pITextStoreACP; ITfContextOwnerCompositionSink *pITfContextOwnerCompositionSink; @@ -85,6 +86,10 @@ typedef struct tagContext { } Context; +typedef struct tagEditCookie { + DWORD lockType; + Context *pOwningContext; +} EditCookie; typedef struct tagTextStoreACPSink { const ITextStoreACPSinkVtbl *TextStoreACPSinkVtbl; @@ -111,6 +116,7 @@ static void free_sink(ContextSink *sink) static void Context_Destructor(Context *This) { struct list *cursor, *cursor2; + EditCookie *cookie; TRACE("destroying %p\n", This); if (This->pITextStoreACPSink) @@ -125,6 +131,13 @@ static void Context_Destructor(Context *This) if (This->pITfContextOwnerCompositionSink) ITextStoreACPSink_Release(This->pITfContextOwnerCompositionSink); + if (This->defaultCookie) + { + cookie = remove_Cookie(This->defaultCookie); + HeapFree(GetProcessHeap(),0,cookie); + This->defaultCookie = 0; + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pContextKeyEventSink) { ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); @@ -481,11 +494,19 @@ static const ITfSourceVtbl Context_SourceVtbl = HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **ppOut, TfEditCookie *pecTextStore) { Context *This; + EditCookie *cookie; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(Context)); if (This == NULL) return E_OUTOFMEMORY; + cookie = HeapAlloc(GetProcessHeap(),0,sizeof(EditCookie)); + if (cookie == NULL) + { + HeapFree(GetProcessHeap(),0,This); + return E_OUTOFMEMORY; + } + TRACE("(%p) %x %p %p %p\n",This, tidOwner, punk, ppOut, pecTextStore); This->ContextVtbl= &Context_ContextVtbl; @@ -494,6 +515,9 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp This->tidOwner = tidOwner; This->connected = FALSE; + cookie->lockType = TF_ES_READ; + cookie->pOwningContext = This; + if (punk) { IUnknown_QueryInterface(punk, &IID_ITextStoreACP, @@ -506,10 +530,8 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp FIXME("Unhandled pUnk\n"); } - TRACE("returning %p\n", This); - *ppOut = (ITfContext*)This; - /* FIXME */ - *pecTextStore = 0xdeaddead; + This->defaultCookie = generate_Cookie(COOKIE_MAGIC_EDITCOOKIE,cookie); + *pecTextStore = This->defaultCookie; list_init(&This->pContextKeyEventSink); list_init(&This->pEditTransactionSink); @@ -517,6 +539,9 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp list_init(&This->pTextEditSink); list_init(&This->pTextLayoutSink); + *ppOut = (ITfContext*)This; + TRACE("returning %p\n", This); + return S_OK; } diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 7e0fd1e..9181b8c 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -25,6 +25,7 @@ #define COOKIE_MAGIC_CONTEXTSINK 0x0020 #define COOKIE_MAGIC_GUIDATOM 0x0030 #define COOKIE_MAGIC_IPPSINK 0x0040 +#define COOKIE_MAGIC_EDITCOOKIE 0x0050 extern DWORD tlsIndex; extern TfClientId processId;

1 0

Nikolay Sivov : comctl32/listview: Don't use uninitialized value.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: c1983382637fcdb80a6cc43e68444f9458b4b9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1983382637fcdb80a6cc43e6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 20 22:13:19 2009 +0400 comctl32/listview: Don't use uninitialized value. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7010a53..6e3509a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6565,7 +6565,7 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lvItem.stateMask = LVIS_STATEIMAGEMASK; if (uView == LVS_ICON) lvItem.stateMask |= LVIS_FOCUSED; lvItem.iItem = iItem; - lvItem.iSubItem = lpht->iSubItem; + lvItem.iSubItem = subitem ? lpht->iSubItem : 0; lvItem.pszText = szDispText; lvItem.cchTextMax = DISP_TEXT_SIZE; if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return -1;

1 0

Aric Stewart : msctf: Generate TfEditCookies for edit sessions.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: bdb54fdaf288bde5a3613dccc50d0f4e7b965303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb54fdaf288bde5a3613dccc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 20 14:46:50 2009 -0500 msctf: Generate TfEditCookies for edit sessions. --- dlls/msctf/context.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 297f611..9733518 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -668,6 +668,8 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, { TextStoreACPSink *This = (TextStoreACPSink *)iface; HRESULT hr; + EditCookie *cookie; + TfEditCookie ec; TRACE("(%p) %x\n",This, dwLockFlags); @@ -677,12 +679,23 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, return E_FAIL; } - /* TODO: generate and use an edit cookie */ - hr = ITfEditSession_DoEditSession(This->pContext->currentEditSession, 0xdeadcafe); + cookie = HeapAlloc(GetProcessHeap(),0,sizeof(EditCookie)); + if (!cookie) + return E_OUTOFMEMORY; + + cookie->lockType = dwLockFlags; + cookie->pOwningContext = This->pContext; + ec = generate_Cookie(COOKIE_MAGIC_EDITCOOKIE, cookie); + + hr = ITfEditSession_DoEditSession(This->pContext->currentEditSession, ec); ITfEditSession_Release(This->pContext->currentEditSession); This->pContext->currentEditSession = NULL; + /* Edit Cookie is only valid during the edit session */ + cookie = remove_Cookie(ec); + HeapFree(GetProcessHeap(),0,cookie); + return hr; }

1 0

Dmitry Timoshkov : dbghelp: All parameters of MiniDumpReadDumpStream() except base are optional.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: d82df8f9b00f5e50dd81732a3760d6b8478779c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82df8f9b00f5e50dd81732a3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 21 13:31:04 2009 +0900 dbghelp: All parameters of MiniDumpReadDumpStream() except base are optional. --- dlls/dbghelp/minidump.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 78e754f..6bc8070 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -1005,9 +1005,9 @@ BOOL WINAPI MiniDumpReadDumpStream(PVOID base, ULONG str_idx, { if (dir->StreamType == str_idx) { - *pdir = dir; - *stream = (char*)base + dir->Location.Rva; - *size = dir->Location.DataSize; + if (pdir) *pdir = dir; + if (stream) *stream = (char*)base + dir->Location.Rva; + if (size) *size = dir->Location.DataSize; return TRUE; } }

1 0