December 2010 - Wine-commits

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

13 Dec '10

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

Jacek Caban : mshtml: Deactivate plugin when detaching from document.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 52cc865cdc2fd060f6bc4a0588cbf310a2dd809e URL: http://source.winehq.org/git/wine.git/?a=commit;h=52cc865cdc2fd060f6bc4a058… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:00:37 2010 +0100 mshtml: Deactivate plugin when detaching from document. --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/htmlobject.c | 2 +- dlls/mshtml/npplugin.c | 1 + dlls/mshtml/pluginhost.c | 34 ++++++++++++++++++++++++++++------ dlls/mshtml/pluginhost.h | 2 +- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a4c1451..7cfa273 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1898,9 +1898,11 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) detach_selection(This); detach_ranges(This); - detach_plugin_hosts(This); release_nodes(This); + while(!list_empty(&This->plugin_hosts)) + detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); + if(This->nsdoc) { release_mutation(This); nsIDOMHTMLDocument_Release(This->nsdoc); diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index c911dd8..1cb8d60 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -423,7 +423,7 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface) HTMLObjectElement *This = HTMLOBJECT_NODE_THIS(iface); if(This->plugin_container.plugin_host) - This->plugin_container.plugin_host->element = NULL; + detach_plugin_host(This->plugin_container.plugin_host); if(This->nsobject) nsIDOMHTMLObjectElement_Release(This->nsobject); diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index ad88da2..20a30ab 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -296,6 +296,7 @@ static NPError CDECL NPP_Destroy(NPP instance, NPSavedData **save) if(!host) return NPERR_GENERIC_ERROR; + detach_plugin_host(host); IOleClientSite_Release(&host->IOleClientSite_iface); instance->pdata = NULL; return NPERR_NO_ERROR; diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8a7e2a6..bce884e 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -954,15 +954,37 @@ static HRESULT assoc_element(PluginHost *host, HTMLDocumentNode *doc, nsIDOMElem return S_OK; } -void detach_plugin_hosts(HTMLDocumentNode *doc) +void detach_plugin_host(PluginHost *host) { - PluginHost *iter; + HRESULT hres; + + TRACE("%p\n", host); + + if(!host->doc) + return; + + if(host->ip_object) + IOleInPlaceObject_InPlaceDeactivate(host->ip_object); - while(!list_empty(&doc->plugin_hosts)) { - iter = LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry); - list_remove(&iter->entry); - iter->doc = NULL; + if(host->plugin_unk) { + IOleObject *ole_obj; + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj); + if(SUCCEEDED(hres)) { + if(!host->ip_object) + IOleObject_Close(ole_obj, OLECLOSE_NOSAVE); + IOleObject_SetClientSite(ole_obj, NULL); + IOleObject_Release(ole_obj); + } } + + if(host->element) { + host->element->plugin_host = NULL; + host->element = NULL; + } + + list_remove(&host->entry); + host->doc = NULL; } HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknown *unk, const CLSID *clsid, PluginHost **ret) diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 30af989..135b2a8 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -52,6 +52,6 @@ extern const IID IID_HTMLPluginContainer; HRESULT create_plugin_host(HTMLDocumentNode*,nsIDOMElement*,IUnknown*,const CLSID*,PluginHost**); void update_plugin_window(PluginHost*,HWND,const RECT*); -void detach_plugin_hosts(HTMLDocumentNode*); +void detach_plugin_host(PluginHost*); HRESULT create_param_prop_bag(nsIDOMHTMLElement*,IPropertyBag**);

1 0

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

13 Dec '10

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

Jacek Caban : mshtml: Added PluginHost::GetWindowContext implementation.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 073a48abe45731ed09ee0a400913d42779a6a975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=073a48abe45731ed09ee0a400… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:00:48 2010 +0100 mshtml: Added PluginHost::GetWindowContext implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/ipwindow.c | 353 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.c | 37 +++++- dlls/mshtml/pluginhost.h | 3 + 4 files changed, 392 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=073a48abe45731ed09ee0…

1 0

Michael Stefaniuc : clock: Add the Oriya translation.
by Alexandre Julliard 13 Dec '10

13 Dec '10

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 13 Dec '10

13 Dec '10

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 13 Dec '10

13 Dec '10

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

Detlef Riekenberg : cmd: Allow GOTO to a label which has a following whitespace, with test.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: d62c6bb77f923bfa3d635f9e484feb78d8c3f78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62c6bb77f923bfa3d635f9e4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 13 00:04:19 2010 +0100 cmd: Allow GOTO to a label which has a following whitespace, with test. --- programs/cmd/builtins.c | 14 ++++++++++++-- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5ccbb8f..8c3f727 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1150,6 +1150,7 @@ void WCMD_give_help (WCHAR *command) { void WCMD_goto (CMD_LIST **cmdList) { WCHAR string[MAX_PATH]; + WCHAR current[MAX_PATH]; /* Do not process any more parts of a processed multipart or multilines command */ if (cmdList) *cmdList = NULL; @@ -1174,8 +1175,17 @@ void WCMD_goto (CMD_LIST **cmdList) { SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { str = string; - while (isspaceW(*str)) str++; - if ((*str == ':') && (lstrcmpiW (++str, paramStart) == 0)) return; + while (isspaceW (*str)) str++; + if (*str == ':') { + DWORD index = 0; + str++; + while (((current[index] = str[index])) && (!isspaceW (current[index]))) + index++; + + /* ignore space at the end */ + current[index] = 0; + if (lstrcmpiW (current, paramStart) == 0) return; + } } WCMD_output (WCMD_LoadMessage(WCMD_NOTARGET)); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 375b7a1..2b117e4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -88,3 +88,6 @@ echo goto with a leading space worked if c==c goto dest3 :dest3 echo goto with a leading tab worked +if d==d goto dest4 +:dest4(a)space@ +echo goto with a following space worked diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dee2c5b..e4644d3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -82,3 +82,4 @@ if /I seems to work goto with no leading space worked goto with a leading space worked goto with a leading tab worked +goto with a following space worked

1 0

Detlef Riekenberg : configure: Ask for the correct development package for gstreamer base plugins.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 654bb4a2317198a4c9540f7d59afd14234acb2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=654bb4a2317198a4c9540f7d5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 12 22:48:56 2010 +0100 configure: Ask for the correct development package for gstreamer base plugins. --- configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4e72097..c1256ba 100755 --- a/configure +++ b/configure @@ -10812,9 +10812,9 @@ fi fi if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes; then : case "x$with_gstreamer" in - x) as_fn_append wine_notices "|gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled" ;; + x) as_fn_append wine_notices "|gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;; xno) ;; - *) as_fn_error $? "gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled + *) as_fn_error $? "gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled This is an error since --with-gstreamer was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 8ad460d..71c14d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1461,7 +1461,7 @@ then CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes], - [gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled]) + [gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled]) test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} dnl **** Check for ALSA 1.x ****

1 0

Alexandre Julliard : user32: Fix coordinates mapping for the desktop window in the explorer process.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: ee44c7c0f4665af2d7f2f29d4ac85a0cdbfa465a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee44c7c0f4665af2d7f2f29d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 12:42:19 2010 +0100 user32: Fix coordinates mapping for the desktop window in the explorer process. --- dlls/user32/win.c | 7 +++++-- dlls/user32/winpos.c | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f1da48b..b61d183 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -740,8 +740,11 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind goto other_process; } win = parent; - OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top ); - OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top ); + if (win->parent) + { + OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top ); + OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top ); + } } break; } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6b623d2..03c16c9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -445,7 +445,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) mirror_from = TRUE; offset.x += wndPtr->rectClient.right - wndPtr->rectClient.left; } - for (;;) + while (wndPtr->parent) { offset.x += wndPtr->rectClient.left; offset.y += wndPtr->rectClient.top; @@ -460,6 +460,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) goto other_process; } } + if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); } } @@ -475,7 +476,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) mirror_to = TRUE; offset.x -= wndPtr->rectClient.right - wndPtr->rectClient.left; } - for (;;) + while (wndPtr->parent) { offset.x -= wndPtr->rectClient.left; offset.y -= wndPtr->rectClient.top; @@ -490,6 +491,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) goto other_process; } } + if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); } }

1 0