December 2010 - Wine-Commits

Jacek Caban : mshtml: Added support for plugin in place activation.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: c65f4c495684380d67ff169ddade3f57b9d7cd69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65f4c495684380d67ff169dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:00:29 2010 +0100 mshtml: Added support for plugin in place activation. --- dlls/mshtml/pluginhost.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/pluginhost.h | 1 + 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 5b8ab71..8a7e2a6 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -298,6 +298,8 @@ static ULONG WINAPI PHClientSite_Release(IOleClientSite *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->ip_object) + IOleInPlaceObject_Release(This->ip_object); list_remove(&This->entry); if(This->element) This->element->plugin_host = NULL; @@ -351,8 +353,10 @@ static HRESULT WINAPI PHClientSite_GetContainer(IOleClientSite *iface, IOleConta static HRESULT WINAPI PHClientSite_ShowObject(IOleClientSite *iface) { PluginHost *This = impl_from_IOleClientSite(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return S_OK; } static HRESULT WINAPI PHClientSite_OnShowWindow(IOleClientSite *iface, BOOL fShow) @@ -684,8 +688,24 @@ static HRESULT WINAPI PHInPlaceSite_OnPosRectChange(IOleInPlaceSiteEx *iface, LP static HRESULT WINAPI PHInPlaceSiteEx_OnInPlaceActivateEx(IOleInPlaceSiteEx *iface, BOOL *pfNoRedraw, DWORD dwFlags) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - FIXME("(%p)->(%p %x)\n", This, pfNoRedraw, dwFlags); - return E_NOTIMPL; + HWND hwnd; + HRESULT hres; + + TRACE("(%p)->(%p %x)\n", This, pfNoRedraw, dwFlags); + + if(This->ip_object) + return S_OK; + + hres = IUnknown_QueryInterface(This->plugin_unk, &IID_IOleInPlaceObject, (void**)&This->ip_object); + if(FAILED(hres)) + return hres; + + hres = IOleInPlaceObject_GetWindow(This->ip_object, &hwnd); + if(SUCCEEDED(hres)) + FIXME("Use hwnd %p\n", hwnd); + + *pfNoRedraw = FALSE; + return S_OK; } static HRESULT WINAPI PHInPlaceSiteEx_OnInPlaceDeactivateEx(IOleInPlaceSiteEx *iface, BOOL fNoRedraw) diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index ee1fed6..30af989 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -31,6 +31,7 @@ typedef struct { LONG ref; IUnknown *plugin_unk; + IOleInPlaceObject *ip_object; CLSID clsid; HWND hwnd; RECT rect;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_destroy().
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: fe2ffe1e6a47f190c3e3b508267bf1bbd96da4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2ffe1e6a47f190c3e3b5082… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 13:40:32 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_destroy(). --- dlls/wined3d/arb_program_shader.c | 16 ++++++------ dlls/wined3d/device.c | 5 ++- dlls/wined3d/glsl_shader.c | 44 ++++++++++++++++++++---------------- dlls/wined3d/shader.c | 4 +- dlls/wined3d/wined3d_private.h | 3 +- 5 files changed, 39 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bd5b197..1526e70 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4702,14 +4702,14 @@ static void shader_arb_deselect_depth_blt(void *shader_priv, const struct wined3 } } -static void shader_arb_destroy(IWineD3DBaseShader *iface) { - IWineD3DBaseShaderImpl *baseShader = (IWineD3DBaseShaderImpl *) iface; - IWineD3DDeviceImpl *device = baseShader->baseShader.device; +static void shader_arb_destroy(IWineD3DBaseShaderImpl *shader) +{ + IWineD3DDeviceImpl *device = shader->baseShader.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - if (shader_is_pshader_version(baseShader->baseShader.reg_maps.shader_version.type)) + if (shader_is_pshader_version(shader->baseShader.reg_maps.shader_version.type)) { - struct arb_pshader_private *shader_data = baseShader->baseShader.backend_data; + struct arb_pshader_private *shader_data = shader->baseShader.backend_data; UINT i; if(!shader_data) return; /* This can happen if a shader was never compiled */ @@ -4731,11 +4731,11 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { HeapFree(GetProcessHeap(), 0, shader_data->gl_shaders); HeapFree(GetProcessHeap(), 0, shader_data); - baseShader->baseShader.backend_data = NULL; + shader->baseShader.backend_data = NULL; } else { - struct arb_vshader_private *shader_data = baseShader->baseShader.backend_data; + struct arb_vshader_private *shader_data = shader->baseShader.backend_data; UINT i; if(!shader_data) return; /* This can happen if a shader was never compiled */ @@ -4757,7 +4757,7 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { HeapFree(GetProcessHeap(), 0, shader_data->gl_shaders); HeapFree(GetProcessHeap(), 0, shader_data); - baseShader->baseShader.backend_data = NULL; + shader->baseShader.backend_data = NULL; } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 15b9020..0789ed9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6182,8 +6182,9 @@ static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl gl_info = context->gl_info; IWineD3DDevice_EnumResources(iface, reset_unload_resources, NULL); - LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { - This->shader_backend->shader_destroy((IWineD3DBaseShader *) shader); + LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) + { + This->shader_backend->shader_destroy(shader); } ENTER_GL(); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a28e9ce..a2fb79a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4672,10 +4672,10 @@ static void shader_glsl_deselect_depth_blt(void *shader_priv, const struct wined checkGLcall("glUseProgramObjectARB"); } -static void shader_glsl_destroy(IWineD3DBaseShader *iface) { +static void shader_glsl_destroy(IWineD3DBaseShaderImpl *shader) +{ const struct list *linked_programs; - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) iface; - IWineD3DDeviceImpl *device = This->baseShader.device; + IWineD3DDeviceImpl *device = shader->baseShader.device; struct shader_glsl_priv *priv = device->shader_priv; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -4683,41 +4683,44 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { /* Note: Do not use QueryInterface here to find out which shader type this is because this code * can be called from IWineD3DBaseShader::Release */ - char pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); + char pshader = shader_is_pshader_version(shader->baseShader.reg_maps.shader_version.type); + + if (pshader) + { + struct glsl_pshader_private *shader_data = shader->baseShader.backend_data; - if(pshader) { - struct glsl_pshader_private *shader_data; - shader_data = This->baseShader.backend_data; if (!shader_data || !shader_data->num_gl_shaders) { HeapFree(GetProcessHeap(), 0, shader_data); - This->baseShader.backend_data = NULL; + shader->baseShader.backend_data = NULL; return; } context = context_acquire(device, NULL); gl_info = context->gl_info; - if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->pshader == iface) + if (priv->glsl_program && (IWineD3DBaseShaderImpl *)priv->glsl_program->pshader == shader) { ENTER_GL(); shader_glsl_select(context, FALSE, FALSE); LEAVE_GL(); } - } else { - struct glsl_vshader_private *shader_data; - shader_data = This->baseShader.backend_data; + } + else + { + struct glsl_vshader_private *shader_data = shader->baseShader.backend_data; + if (!shader_data || !shader_data->num_gl_shaders) { HeapFree(GetProcessHeap(), 0, shader_data); - This->baseShader.backend_data = NULL; + shader->baseShader.backend_data = NULL; return; } context = context_acquire(device, NULL); gl_info = context->gl_info; - if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->vshader == iface) + if (priv->glsl_program && (IWineD3DBaseShaderImpl *)priv->glsl_program->vshader == shader) { ENTER_GL(); shader_glsl_select(context, FALSE, FALSE); @@ -4725,7 +4728,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { } } - linked_programs = &This->baseShader.linked_programs; + linked_programs = &shader->baseShader.linked_programs; TRACE("Deleting linked programs\n"); if (linked_programs->next) { @@ -4744,9 +4747,10 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { LEAVE_GL(); } - if(pshader) { + if (pshader) + { + struct glsl_pshader_private *shader_data = shader->baseShader.backend_data; UINT i; - struct glsl_pshader_private *shader_data = This->baseShader.backend_data; ENTER_GL(); for(i = 0; i < shader_data->num_gl_shaders; i++) { @@ -4759,8 +4763,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { } else { + struct glsl_vshader_private *shader_data = shader->baseShader.backend_data; UINT i; - struct glsl_vshader_private *shader_data = This->baseShader.backend_data; ENTER_GL(); for(i = 0; i < shader_data->num_gl_shaders; i++) { @@ -4772,8 +4776,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { HeapFree(GetProcessHeap(), 0, shader_data->gl_shaders); } - HeapFree(GetProcessHeap(), 0, This->baseShader.backend_data); - This->baseShader.backend_data = NULL; + HeapFree(GetProcessHeap(), 0, shader->baseShader.backend_data); + shader->baseShader.backend_data = NULL; context_release(context); } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4a72e88..1220e21 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1479,7 +1479,7 @@ static void shader_cleanup(IWineD3DBaseShader *iface) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; - shader->baseShader.device->shader_backend->shader_destroy(iface); + shader->baseShader.device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->baseShader.reg_maps.constf); HeapFree(GetProcessHeap(), 0, shader->baseShader.function); shader_delete_constant_list(&shader->baseShader.constantsF); @@ -1503,7 +1503,7 @@ static void shader_none_update_float_pixel_constants(IWineD3DDeviceImpl *device, static void shader_none_load_constants(const struct wined3d_context *context, char usePS, char useVS) {} static void shader_none_load_np2fixup_constants(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) {} -static void shader_none_destroy(IWineD3DBaseShader *iface) {} +static void shader_none_destroy(IWineD3DBaseShaderImpl *shader) {} static HRESULT shader_none_alloc(IWineD3DDeviceImpl *device) {return WINED3D_OK;} static void shader_none_free(IWineD3DDeviceImpl *device) {} static BOOL shader_none_dirty_const(void) {return FALSE;} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7612eb..6769956 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -57,6 +57,7 @@ typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; typedef struct IWineD3DPaletteImpl IWineD3DPaletteImpl; typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl; typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; +struct IWineD3DBaseShaderImpl; /* Texture format fixups */ @@ -758,7 +759,7 @@ typedef struct { void (*shader_load_constants)(const struct wined3d_context *context, char usePS, char useVS); void (*shader_load_np2fixup_constants)(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state); - void (*shader_destroy)(IWineD3DBaseShader *iface); + void (*shader_destroy)(struct IWineD3DBaseShaderImpl *shader); HRESULT (*shader_alloc_private)(IWineD3DDeviceImpl *device); void (*shader_free_private)(IWineD3DDeviceImpl *device); BOOL (*shader_dirtifyable_constants)(void);

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_generate_glsl_declarations ().
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 97ca0e6863d0c5fa6f3481744d27f41f76604495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ca0e6863d0c5fa6f3481744… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 13:40:31 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_generate_glsl_declarations(). --- dlls/wined3d/glsl_shader.c | 52 +++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 19f0cc4..a28e9ce 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -906,11 +906,10 @@ static unsigned int vec4_varyings(DWORD shader_major, const struct wined3d_gl_in /** Generate the variable & register declarations for the GLSL output target */ static void shader_generate_glsl_declarations(const struct wined3d_context *context, - struct wined3d_shader_buffer *buffer, IWineD3DBaseShader *iface, + struct wined3d_shader_buffer *buffer, IWineD3DBaseShaderImpl *shader, const struct wined3d_shader_reg_maps *reg_maps, struct shader_glsl_ctx_priv *ctx_priv) { - IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; - IWineD3DDeviceImpl *device = This->baseShader.device; + IWineD3DDeviceImpl *device = shader->baseShader.device; const struct wined3d_state *state = &device->stateBlock->state; const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -929,7 +928,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Declare the constants (aka uniforms) */ - if (This->baseShader.limits.constant_float > 0) { + if (shader->baseShader.limits.constant_float > 0) + { unsigned max_constantsF; /* Unless the shader uses indirect addressing, always declare the maximum array size and ignore that we need some * uniforms privately. E.g. if GL supports 256 uniforms, and we need 2 for the pos fixup and immediate values, still @@ -982,18 +982,18 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont max_constantsF = gl_info->limits.glsl_vs_float_constants; } } - max_constantsF = min(This->baseShader.limits.constant_float, max_constantsF); + max_constantsF = min(shader->baseShader.limits.constant_float, max_constantsF); shader_addline(buffer, "uniform vec4 %cC[%u];\n", prefix, max_constantsF); } - /* Always declare the full set of constants, the compiler can remove the unused ones because d3d doesn't(yet) - * support indirect int and bool constant addressing. This avoids problems if the app uses e.g. i0 and i9. - */ - if (This->baseShader.limits.constant_int > 0 && reg_maps->integer_constants) - shader_addline(buffer, "uniform ivec4 %cI[%u];\n", prefix, This->baseShader.limits.constant_int); + /* Always declare the full set of constants, the compiler can remove the + * unused ones because d3d doesn't (yet) support indirect int and bool + * constant addressing. This avoids problems if the app uses e.g. i0 and i9. */ + if (shader->baseShader.limits.constant_int > 0 && reg_maps->integer_constants) + shader_addline(buffer, "uniform ivec4 %cI[%u];\n", prefix, shader->baseShader.limits.constant_int); - if (This->baseShader.limits.constant_bool > 0 && reg_maps->boolean_constants) - shader_addline(buffer, "uniform bool %cB[%u];\n", prefix, This->baseShader.limits.constant_bool); + if (shader->baseShader.limits.constant_bool > 0 && reg_maps->boolean_constants) + shader_addline(buffer, "uniform bool %cB[%u];\n", prefix, shader->baseShader.limits.constant_bool); if (!pshader) { @@ -1027,11 +1027,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } if (reg_maps->vpos || reg_maps->usesdsy) { - if (This->baseShader.limits.constant_float + extra_constants_needed + if (shader->baseShader.limits.constant_float + extra_constants_needed + 1 < gl_info->limits.glsl_ps_float_constants) { shader_addline(buffer, "uniform vec4 ycorrection;\n"); - ((IWineD3DPixelShaderImpl *) This)->vpos_uniform = 1; + ((IWineD3DPixelShaderImpl *)shader)->vpos_uniform = 1; extra_constants_needed++; } else { /* This happens because we do not have proper tracking of the constant registers that are @@ -1047,7 +1047,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Declare texture samplers */ - for (i = 0; i < This->baseShader.limits.sampler; i++) { + for (i = 0; i < shader->baseShader.limits.sampler; ++i) + { if (reg_maps->sampler_type[i]) { IWineD3DBaseTextureImpl *texture; @@ -1107,8 +1108,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont * samplerNP2Fixup stores texture dimensions and is updated through * shader_glsl_load_np2fixup_constants when the sampler changes. */ - for (i = 0; i < This->baseShader.limits.sampler; ++i) { - if (reg_maps->sampler_type[i]) { + for (i = 0; i < shader->baseShader.limits.sampler; ++i) + { + if (reg_maps->sampler_type[i]) + { if (!(ps_args->np2_fixup & (1 << i))) continue; if (WINED3DSTT_2D != reg_maps->sampler_type[i]) { @@ -1154,9 +1157,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Declare output register temporaries */ - if(This->baseShader.limits.packed_output) { - shader_addline(buffer, "vec4 OUT[%u];\n", This->baseShader.limits.packed_output); - } + if (shader->baseShader.limits.packed_output) + shader_addline(buffer, "vec4 OUT[%u];\n", shader->baseShader.limits.packed_output); /* Declare temporary variables */ for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) @@ -1187,8 +1189,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont * They can't be hardcoded into the shader text via LC = {x, y, z, w}; because the * float -> string conversion can cause precision loss. */ - if(!This->baseShader.load_local_constsF) { - LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + if (!shader->baseShader.load_local_constsF) + { + LIST_FOR_EACH_ENTRY(lconst, &shader->baseShader.constantsF, local_constant, entry) + { shader_addline(buffer, "uniform vec4 %cLC%u;\n", prefix, lconst->idx); } } @@ -3991,7 +3995,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context } /* Base Declarations */ - shader_generate_glsl_declarations(context, buffer, (IWineD3DBaseShader *)This, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context, buffer, (IWineD3DBaseShaderImpl *)This, reg_maps, &priv_ctx); /* Pack 3.0 inputs */ if (reg_maps->shader_version.major >= 3 && args->vp_mode != vertexshader) @@ -4083,7 +4087,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context priv_ctx.cur_vs_args = args; /* Base Declarations */ - shader_generate_glsl_declarations(context, buffer, (IWineD3DBaseShader *)This, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context, buffer, (IWineD3DBaseShaderImpl *)This, reg_maps, &priv_ctx); /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, &priv_ctx);

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_cleanup().
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: bbbab10c8e647bba23929ca7db3a4803adf3fe29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbab10c8e647bba23929ca7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 13:40:33 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_cleanup(). --- dlls/wined3d/shader.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1220e21..31ece02 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1475,10 +1475,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } } -static void shader_cleanup(IWineD3DBaseShader *iface) +static void shader_cleanup(IWineD3DBaseShaderImpl *shader) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; - shader->baseShader.device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->baseShader.reg_maps.constf); HeapFree(GetProcessHeap(), 0, shader->baseShader.function); @@ -1661,7 +1659,7 @@ static ULONG STDMETHODCALLTYPE vertexshader_Release(IWineD3DVertexShader *iface) if (!refcount) { - shader_cleanup((IWineD3DBaseShader *)iface); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); shader->baseShader.parent_ops->wined3d_object_destroyed(shader->baseShader.parent); HeapFree(GetProcessHeap(), 0, shader); } @@ -1860,7 +1858,7 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * if (FAILED(hr)) { WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup((IWineD3DBaseShader *)shader); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); return hr; } @@ -1933,7 +1931,7 @@ static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DGeometryShader *if if (!refcount) { - shader_cleanup((IWineD3DBaseShader *)iface); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); shader->base_shader.parent_ops->wined3d_object_destroyed(shader->base_shader.parent); HeapFree(GetProcessHeap(), 0, shader); } @@ -1980,7 +1978,7 @@ HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDevic if (FAILED(hr)) { WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup((IWineD3DBaseShader *)shader); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); return hr; } @@ -2029,7 +2027,7 @@ static ULONG STDMETHODCALLTYPE pixelshader_Release(IWineD3DPixelShader *iface) if (!refcount) { - shader_cleanup((IWineD3DBaseShader *)iface); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); shader->baseShader.parent_ops->wined3d_object_destroyed(shader->baseShader.parent); HeapFree(GetProcessHeap(), 0, shader); } @@ -2267,7 +2265,7 @@ HRESULT pixelshader_init(IWineD3DPixelShaderImpl *shader, IWineD3DDeviceImpl *de if (FAILED(hr)) { WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup((IWineD3DBaseShader *)shader); + shader_cleanup((IWineD3DBaseShaderImpl *)shader); return hr; }

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_generate_arb_declarations ().
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 8ea7d1ef71af870235eea4a474e30d7f85243a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea7d1ef71af870235eea4a47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 13:40:30 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_generate_arb_declarations(). --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6c10fa6..bd5b197 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -694,12 +694,11 @@ static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This) } /* Generate the variable & register declarations for the ARB_vertex_program output target */ -static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, +static DWORD shader_generate_arb_declarations(IWineD3DBaseShaderImpl *shader, const struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_buffer *buffer, const struct wined3d_gl_info *gl_info, DWORD *lconst_map, DWORD *num_clipplanes, struct shader_arb_ctx_priv *ctx) { - IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; DWORD i, next_local = 0; char pshader = shader_is_pshader_version(reg_maps->shader_version.type); unsigned max_constantsF; @@ -725,7 +724,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, } else { - const struct arb_vshader_private *shader_data = This->baseShader.backend_data; + const struct arb_vshader_private *shader_data = shader->baseShader.backend_data; max_constantsF = gl_info->limits.arb_vs_native_constants; /* 96 is the minimum MAX_PROGRAM_ENV_PARAMETERS_ARB value. * Also prevents max_constantsF from becoming less than 0 and @@ -740,7 +739,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, max_constantsF -= reserved_vs_const(shader_data, reg_maps, gl_info); max_constantsF -= count_bits(reg_maps->integer_constants); - for(i = 0; i < This->baseShader.limits.constant_float; i++) + for (i = 0; i < shader->baseShader.limits.constant_float; ++i) { DWORD idx = i >> 5; DWORD shift = i & 0x1f; @@ -794,8 +793,10 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, /* Load local constants using the program-local space, * this avoids reloading them each time the shader is used */ - if(lconst_map) { - LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + if (lconst_map) + { + LIST_FOR_EACH_ENTRY(lconst, &shader->baseShader.constantsF, local_constant, entry) + { shader_addline(buffer, "PARAM C%u = program.local[%u];\n", lconst->idx, lconst_map[lconst->idx]); next_local = max(next_local, lconst_map[lconst->idx] + 1); @@ -815,7 +816,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, } /* Avoid declaring more constants than needed */ - max_constantsF = min(max_constantsF, This->baseShader.limits.constant_float); + max_constantsF = min(max_constantsF, shader->baseShader.limits.constant_float); /* we use the array-based constants array if the local constants are marked for loading, * because then we use indirect addressing, or when the local constant list is empty, @@ -833,7 +834,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, DWORD idx, mask; idx = i >> 5; mask = 1 << (i & 0x1f); - if (!shader_constant_is_local(This, i) && (reg_maps->constf[idx] & mask)) + if (!shader_constant_is_local(shader, i) && (reg_maps->constf[idx] & mask)) { shader_addline(buffer, "PARAM C%d = program.env[%d];\n",i, i); } @@ -3649,7 +3650,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, } /* Base Declarations */ - next_local = shader_generate_arb_declarations((IWineD3DBaseShader *)This, + next_local = shader_generate_arb_declarations((IWineD3DBaseShaderImpl *)This, reg_maps, buffer, gl_info, lconst_map, NULL, &priv_ctx); for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) @@ -4121,7 +4122,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, shader_addline(buffer, "TEMP TA;\n"); /* Base Declarations */ - next_local = shader_generate_arb_declarations((IWineD3DBaseShader *)This, + next_local = shader_generate_arb_declarations((IWineD3DBaseShaderImpl *)This, reg_maps, buffer, gl_info, lconst_map, &priv_ctx.vs_clipplanes, &priv_ctx); for(i = 0; i < MAX_CONST_I; i++)

1 0

Michael Stefaniuc : clock: Add the Oriya translation.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: cddc8e71cc402e2306a87d0315b16b694b4cb62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cddc8e71cc402e2306a87d031… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 12 23:47:59 2010 +0100 clock: Add the Oriya translation. Translation by Manoj Giri. --- programs/clock/Makefile.in | 1 + programs/clock/Or.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 74d730b..7b674f8 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -26,6 +26,7 @@ RC_SRCS = \ Ml.rc \ Nl.rc \ No.rc \ + Or.rc \ Pl.rc \ Pt.rc \ Ro.rc \ diff --git a/programs/clock/Or.rc b/programs/clock/Or.rc new file mode 100644 index 0000000..d668b9c --- /dev/null +++ b/programs/clock/Or.rc @@ -0,0 +1,51 @@ +/* + * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Manoj Giri + * Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "clock_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_ORIYA, SUBLANG_NEUTRAL + +MAIN_MENU MENU +{ + POPUP "ସୂଚନା (&o)" { + MENUITEM "ଆନାଲଗ ‍‌(&l)", IDM_ANALOG + MENUITEM "ଡିଜିଟାଲ (&)", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "ଅକ୍ଷରରୂପ (&F)...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "ଶୀର୍ଷକ ପଟି ବିନା (&W)", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "ସେକଣ୍ଡ (&S)", IDM_SECONDS + MENUITEM "ତାରିଖ (&D)", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "ସର୍ବଦା ଉପରେ (&A)", IDM_ONTOP + } + POPUP "ସୂଚନା (&o)" { + MENUITEM "ଘଡ଼ି ବିଷୟରେ (&A)...", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_CLOCK, "ଘଡ଼ି" +}

1 0

Michael Stefaniuc : clock: Add the Punjabi translation.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 47446593279d16977667648e371582b0d25d9759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47446593279d16977667648e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 12 23:48:12 2010 +0100 clock: Add the Punjabi translation. Translation by Jaswinder Singh. --- programs/clock/Makefile.in | 1 + programs/clock/Pa.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 7b674f8..d40906e 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ Nl.rc \ No.rc \ Or.rc \ + Pa.rc \ Pl.rc \ Pt.rc \ Ro.rc \ diff --git a/programs/clock/Pa.rc b/programs/clock/Pa.rc new file mode 100644 index 0000000..361a6db --- /dev/null +++ b/programs/clock/Pa.rc @@ -0,0 +1,51 @@ +/* + * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Cpoyright 2010 Jaswinder Singh + * Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "clock_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PUNJABI, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "ਜਾਣਕਾਰੀ(&o)" { + MENUITEM "ਐਨਾਲਾਗ(&l)", IDM_ANALOG + MENUITEM "ਡਿਜ਼ੀਟਲ(&t)", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "ਫੌਂਟ(&F)...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "ਟਾਈਟਲਬਾਰ ਤੋਂ ਬਿਨਾਂ(&W)", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "ਸਕਿੰਟ(&S)", IDM_SECONDS + MENUITEM "ਮਿਤੀ(&D)", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "ਹਮੇਸ਼ਾ ਉੱਪਰ(&A)", IDM_ONTOP + } + POPUP "ਜਾਣਕਾਰੀ(&o)" { + MENUITEM "ਘੜੀ ਬਾਰੇ(&A)...", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_CLOCK, "ਘੜੀ" +}

1 0

Michael Stefaniuc : oleaut32: Standardize the COM usage in connpt.c.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: dacdb07dc454c58845450efc3c26127cba23e909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dacdb07dc454c58845450efc3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 12 23:49:02 2010 +0100 oleaut32: Standardize the COM usage in connpt.c. --- dlls/oleaut32/connpt.c | 55 +++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index 94e8e7c..59768a0 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); */ typedef struct ConnectionPointImpl { - const IConnectionPointVtbl *lpvtbl; + IConnectionPoint IConnectionPoint_iface; /* IUnknown of our main object*/ IUnknown *Obj; @@ -74,7 +74,7 @@ static const IConnectionPointVtbl ConnectionPointImpl_VTable; */ typedef struct EnumConnectionsImpl { - const IEnumConnectionsVtbl *lpvtbl; + IEnumConnections IEnumConnections_iface; LONG ref; @@ -94,6 +94,15 @@ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk, DWORD nSinks, CONNECTDATA *pCD); +static inline ConnectionPointImpl *impl_from_IConnectionPoint(IConnectionPoint *iface) +{ + return CONTAINING_RECORD(iface, ConnectionPointImpl, IConnectionPoint_iface); +} + +static inline EnumConnectionsImpl *impl_from_IEnumConnections(IEnumConnections *iface) +{ + return CONTAINING_RECORD(iface, EnumConnectionsImpl, IEnumConnections_iface); +} /************************************************************************ * ConnectionPointImpl_Construct @@ -104,7 +113,7 @@ static ConnectionPointImpl *ConnectionPointImpl_Construct(IUnknown *pUnk, ConnectionPointImpl *Obj; Obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*Obj)); - Obj->lpvtbl = &ConnectionPointImpl_VTable; + Obj->IConnectionPoint_iface.lpVtbl = &ConnectionPointImpl_VTable; Obj->Obj = pUnk; Obj->ref = 1; Obj->iid = *riid; @@ -143,7 +152,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( REFIID riid, void** ppvObject) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); /* @@ -178,7 +187,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( * Query Interface always increases the reference count by one when it is * successful */ - ConnectionPointImpl_AddRef((IConnectionPoint*)This); + ConnectionPointImpl_AddRef(&This->IConnectionPoint_iface); return S_OK; } @@ -191,7 +200,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( */ static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); @@ -207,7 +216,7 @@ static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface) static ULONG WINAPI ConnectionPointImpl_Release( IConnectionPoint* iface) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); @@ -228,7 +237,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface( IConnectionPoint *iface, IID *piid) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%p) returning %s\n", This, piid, debugstr_guid(&(This->iid))); *piid = This->iid; return S_OK; @@ -242,7 +251,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( IConnectionPoint *iface, IConnectionPointContainer **ppCPC) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%p)\n", This, ppCPC); return IUnknown_QueryInterface(This->Obj, @@ -259,7 +268,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, DWORD *pdwCookie) { DWORD i; - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); IUnknown *lpSink; TRACE("(%p)->(%p, %p)\n", This, lpUnk, pdwCookie); @@ -290,7 +299,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, DWORD dwCookie) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%d)\n", This, dwCookie); if(dwCookie == 0 || dwCookie > This->maxSinks) return E_INVALIDARG; @@ -311,7 +320,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections( IConnectionPoint *iface, LPENUMCONNECTIONS *ppEnum) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); CONNECTDATA *pCD; DWORD i, nextslot; EnumConnectionsImpl *EnumObj; @@ -339,9 +348,9 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections( IUnknown_AddRef((IUnknown*)This); EnumObj = EnumConnectionsImpl_Construct((IUnknown*)This, This->nSinks, pCD); - hr = IEnumConnections_QueryInterface((IEnumConnections*)EnumObj, + hr = IEnumConnections_QueryInterface(&EnumObj->IEnumConnections_iface, &IID_IEnumConnections, (LPVOID)ppEnum); - IEnumConnections_Release((IEnumConnections*)EnumObj); + IEnumConnections_Release(&EnumObj->IEnumConnections_iface); HeapFree(GetProcessHeap(), 0, pCD); return hr; @@ -373,7 +382,7 @@ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk, EnumConnectionsImpl *Obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*Obj)); DWORD i; - Obj->lpvtbl = &EnumConnectionsImpl_VTable; + Obj->IEnumConnections_iface.lpVtbl = &EnumConnectionsImpl_VTable; Obj->ref = 1; Obj->pUnk = pUnk; Obj->pCD = HeapAlloc(GetProcessHeap(), 0, nSinks * sizeof(CONNECTDATA)); @@ -460,7 +469,7 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( */ static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); @@ -476,7 +485,7 @@ static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface) */ static ULONG WINAPI EnumConnectionsImpl_Release(IEnumConnections* iface) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); @@ -499,7 +508,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, ULONG cConn, LPCONNECTDATA pCD, ULONG *pEnum) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); DWORD nRet = 0; TRACE("(%p)->(%d, %p, %p)\n", This, cConn, pCD, pEnum); @@ -534,7 +543,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, ULONG cSkip) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); TRACE("(%p)->(%d)\n", This, cSkip); if(This->nCur + cSkip >= This->nConns) @@ -552,7 +561,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, */ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); TRACE("(%p)\n", This); This->nCur = 0; @@ -568,7 +577,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface, LPENUMCONNECTIONS *ppEnum) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); EnumConnectionsImpl *newObj; TRACE("(%p)->(%p)\n", This, ppEnum); @@ -613,8 +622,8 @@ HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid, Obj = ConnectionPointImpl_Construct(pUnk, riid); if(!Obj) return E_OUTOFMEMORY; - hr = IConnectionPoint_QueryInterface((IConnectionPoint *)Obj, + hr = IConnectionPoint_QueryInterface(&Obj->IConnectionPoint_iface, &IID_IConnectionPoint, (LPVOID)pCP); - IConnectionPoint_Release((IConnectionPoint *)Obj); + IConnectionPoint_Release(&Obj->IConnectionPoint_iface); return hr; }

1 0

Eric Pouech : kernel32: When reading chars out of a bare console, use the Unix API (instead of the Windows one).
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 4149643fbe1b3c9c92810fc5cdfc10487e807311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4149643fbe1b3c9c92810fc5c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 12 22:31:32 2010 +0100 kernel32: When reading chars out of a bare console, use the Unix API (instead of the Windows one). --- dlls/kernel32/console.c | 56 ++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index c0af117..97eae17 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -41,6 +41,9 @@ #ifdef HAVE_TERMIOS_H # include <termios.h> #endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -1112,33 +1115,35 @@ static BOOL handle_simple_char(HANDLE conin, unsigned real_inchar) return WriteConsoleInputW(conin, ir, numEvent, &written); } -static enum read_console_input_return bare_console_fetch_input(HANDLE handle, DWORD timeout) +static enum read_console_input_return bare_console_fetch_input(HANDLE handle, int fd, DWORD timeout) { - OVERLAPPED ov; - enum read_console_input_return ret; - char ch; - - /* get the real handle to the console object */ - handle = wine_server_ptr_handle(console_handle_unmap(handle)); + struct pollfd pollfd; + char ch; + enum read_console_input_return ret; - memset(&ov, 0, sizeof(ov)); - ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + pollfd.fd = fd; + pollfd.events = POLLIN; + pollfd.revents = 0; - if (ReadFile(handle, &ch, 1, NULL, &ov) || - (GetLastError() == ERROR_IO_PENDING && - WaitForSingleObject(ov.hEvent, timeout) == WAIT_OBJECT_0 && - GetOverlappedResult(handle, &ov, NULL, FALSE))) + switch (poll(&pollfd, 1, timeout)) { - ret = handle_simple_char(handle, ch) ? rci_gotone : rci_error; - } - else - { - WARN("Failed read %x\n", GetLastError()); - ret = rci_error; + case 1: + RtlEnterCriticalSection(&CONSOLE_CritSect); + switch (read(fd, &ch, 1)) + { + case 1: ret = handle_simple_char(handle, ch) ? rci_gotone : rci_error; break; + /* actually another thread likely beat us to reading the char + * return gotone, while not perfect, it should work in most of the cases (as the new event + * should be now in the queue) + */ + case 0: ret = rci_gotone; break; + default: ret = rci_error; break; + } + RtlLeaveCriticalSection(&CONSOLE_CritSect); + return ret; + case 0: return rci_timeout; + default: return rci_error; } - CloseHandle(ov.hEvent); - - return ret; } static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_RECORD ir, DWORD timeout) @@ -1149,12 +1154,13 @@ static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_R if ((fd = get_console_bare_fd(handle)) != -1) { put_console_into_raw_mode(fd); - close(fd); if (WaitForSingleObject(GetConsoleInputWaitHandle(), 0) != WAIT_OBJECT_0) { - ret = bare_console_fetch_input(handle, timeout); - if (ret != rci_gotone) return ret; + ret = bare_console_fetch_input(handle, fd, timeout); } + else ret = rci_gotone; + close(fd); + if (ret != rci_gotone) return ret; } else {

1 0

Eric Pouech : kernel32: Proper support for echo-input (enable/disable) when getting console input.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 8b4c2ce9c58a43c5501d3f21b0c8d7e01c8bc767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4c2ce9c58a43c5501d3f21b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 12 22:31:40 2010 +0100 kernel32: Proper support for echo-input (enable/disable) when getting console input. --- dlls/kernel32/editline.c | 70 +++++++++++++++++++++++++++------------------- 1 files changed, 41 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 4d02d77..4dff110 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -66,6 +66,7 @@ typedef struct WCEL_Context { unsigned done : 1, /* to 1 when we're done with editing */ error : 1, /* to 1 when an error occurred in the editing */ can_wrap : 1, /* to 1 when multi-line edition can take place */ + shall_echo : 1, /* to 1 when characters should be echo:ed when keyed-in */ can_pos_cursor : 1; /* to 1 when console can (re)position cursor */ unsigned histSize; unsigned histPos; @@ -128,6 +129,7 @@ static inline COORD WCEL_GetCoord(WCEL_Context* ctx, int ofs) static inline void WCEL_Update(WCEL_Context* ctx, int beg, int len) { + if (!ctx->shall_echo) return; if (ctx->can_pos_cursor) { WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[beg], len, @@ -194,34 +196,38 @@ static BOOL WCEL_Grow(WCEL_Context* ctx, size_t len) static void WCEL_DeleteString(WCEL_Context* ctx, int beg, int end) { unsigned str_len = end - beg; - COORD cbeg = WCEL_GetCoord(ctx, ctx->len - str_len); - COORD cend = WCEL_GetCoord(ctx, ctx->len); - CHAR_INFO ci; if (end < ctx->len) memmove(&ctx->line[beg], &ctx->line[end], (ctx->len - end) * sizeof(WCHAR)); /* we need to clean from ctx->len - str_len to ctx->len */ - ci.Char.UnicodeChar = ' '; - ci.Attributes = ctx->csbi.wAttributes; - - if (cbeg.Y == cend.Y) - { - /* partial erase of sole line */ - CONSOLE_FillLineUniform(ctx->hConOut, cbeg.X, cbeg.Y, - cend.X - cbeg.X, &ci); - } - else + if (ctx->shall_echo) { - int i; - /* erase til eol on first line */ - CONSOLE_FillLineUniform(ctx->hConOut, cbeg.X, cbeg.Y, - ctx->csbi.dwSize.X - cbeg.X, &ci); - /* completely erase all the others (full lines) */ - for (i = cbeg.Y + 1; i < cend.Y; i++) - CONSOLE_FillLineUniform(ctx->hConOut, 0, i, ctx->csbi.dwSize.X, &ci); - /* erase from beginning of line until last pos on last line */ - CONSOLE_FillLineUniform(ctx->hConOut, 0, cend.Y, cend.X, &ci); + COORD cbeg = WCEL_GetCoord(ctx, ctx->len - str_len); + COORD cend = WCEL_GetCoord(ctx, ctx->len); + CHAR_INFO ci; + + ci.Char.UnicodeChar = ' '; + ci.Attributes = ctx->csbi.wAttributes; + + if (cbeg.Y == cend.Y) + { + /* partial erase of sole line */ + CONSOLE_FillLineUniform(ctx->hConOut, cbeg.X, cbeg.Y, + cend.X - cbeg.X, &ci); + } + else + { + int i; + /* erase til eol on first line */ + CONSOLE_FillLineUniform(ctx->hConOut, cbeg.X, cbeg.Y, + ctx->csbi.dwSize.X - cbeg.X, &ci); + /* completely erase all the others (full lines) */ + for (i = cbeg.Y + 1; i < cend.Y; i++) + CONSOLE_FillLineUniform(ctx->hConOut, 0, i, ctx->csbi.dwSize.X, &ci); + /* erase from beginning of line until last pos on last line */ + CONSOLE_FillLineUniform(ctx->hConOut, 0, cend.Y, cend.X, &ci); + } } ctx->len -= str_len; WCEL_Update(ctx, 0, ctx->len); @@ -378,7 +384,8 @@ static void WCEL_FindPrevInHist(WCEL_Context* ctx) ctx->ofs = 0; WCEL_InsertString(ctx, data); ctx->ofs = oldofs; - SetConsoleCursorPosition(ctx->hConOut, WCEL_GetCoord(ctx, ctx->ofs)); + if (ctx->shall_echo) + SetConsoleCursorPosition(ctx->hConOut, WCEL_GetCoord(ctx, ctx->ofs)); HeapFree(GetProcessHeap(), 0, data); return; } @@ -630,15 +637,18 @@ static void WCEL_MoveToLastHist(WCEL_Context* ctx) static void WCEL_Redraw(WCEL_Context* ctx) { - COORD c = WCEL_GetCoord(ctx, ctx->len); - CHAR_INFO ci; + if (ctx->shall_echo) + { + COORD c = WCEL_GetCoord(ctx, ctx->len); + CHAR_INFO ci; - WCEL_Update(ctx, 0, ctx->len); + WCEL_Update(ctx, 0, ctx->len); - ci.Char.UnicodeChar = ' '; - ci.Attributes = ctx->csbi.wAttributes; + ci.Char.UnicodeChar = ' '; + ci.Attributes = ctx->csbi.wAttributes; - CONSOLE_FillLineUniform(ctx->hConOut, c.X, c.Y, ctx->csbi.dwSize.X - c.X, &ci); + CONSOLE_FillLineUniform(ctx->hConOut, c.X, c.Y, ctx->csbi.dwSize.X - c.X, &ci); + } } static void WCEL_RepeatCount(WCEL_Context* ctx) @@ -812,6 +822,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE || !GetConsoleScreenBufferInfo(ctx.hConOut, &ctx.csbi)) return NULL; + ctx.shall_echo = (GetConsoleMode(hConsoleIn, &ks) && (ks & ENABLE_ECHO_INPUT)) ? 1 : 0; ctx.can_wrap = (GetConsoleMode(ctx.hConOut, &ks) && (ks & ENABLE_WRAP_AT_EOL_OUTPUT)) ? 1 : 0; ctx.can_pos_cursor = can_pos_cursor; @@ -868,6 +879,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) else TRACE("Dropped event\n"); /* EPP WCEL_Dump(&ctx, "after func"); */ + if (!ctx.shall_echo) continue; if (ctx.can_pos_cursor) { if (ctx.ofs != ofs)

1 0