September 2011 - Wine-commits

Jacek Caban : vbscript: Added interp_mcall implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 308b2641d929c88a80361d1077e4ab5c2d5fbea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308b2641d929c88a80361d107… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:21:44 2011 +0200 vbscript: Added interp_mcall implementation. --- dlls/vbscript/interp.c | 5 +++-- dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index beacfe9..2d0b7cb 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -374,8 +374,9 @@ static HRESULT interp_mcall(exec_ctx_t *ctx) static HRESULT interp_mcallv(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + return do_mcall(ctx, NULL); } static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_val) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ec85614..06542cd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -405,4 +405,8 @@ Set obj = New TestClass Call ok(obj.publicFunction = 4, "obj.publicFunction = " & obj.publicFunction) Call ok(obj.publicFunction() = 4, "obj.publicFunction() = " & obj.publicFunction()) +obj.publicSub() +Call obj.publicSub +Call obj.publicFunction() + reportSuccess()

1 0

Jacek Caban : vbscript: Added this object to identifier lookup chanin.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 1e01a176a38f4792ea7589d05f991fa93960b947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e01a176a38f4792ea7589d05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:21:58 2011 +0200 vbscript: Added this object to identifier lookup chanin. --- dlls/vbscript/interp.c | 32 ++++++++++++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/vbdisp.c | 32 +++++++++++++++++++++++--------- dlls/vbscript/vbscript.c | 2 +- dlls/vbscript/vbscript.h | 4 ++-- 5 files changed, 53 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2d0b7cb..a0e926d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -30,6 +30,7 @@ typedef struct { instr_t *instr; script_ctx_t *script; function_t *func; + IDispatch *this_obj; VARIANT *args; VARIANT *vars; @@ -113,6 +114,14 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } + hres = disp_get_id(ctx->this_obj, name, TRUE, &id); + if(SUCCEEDED(hres)) { + ref->type = REF_DISP; + ref->u.d.disp = ctx->this_obj; + ref->u.d.id = id; + return S_OK; + } + if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; @@ -125,8 +134,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { - if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { - hres = disp_get_id(item->disp, name, &id); + if((item->flags & SCRIPTITEM_GLOBALMEMBERS) && item->disp != ctx->this_obj) { + hres = disp_get_id(item->disp, name, FALSE, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; ref->u.d.disp = item->disp; @@ -294,7 +303,7 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) return hres; break; case REF_FUNC: - hres = exec_script(ctx->script, ref.u.f, &dp, res); + hres = exec_script(ctx->script, ref.u.f, NULL, &dp, res); if(FAILED(hres)) return hres; break; @@ -347,7 +356,7 @@ static HRESULT do_mcall(exec_ctx_t *ctx, VARIANT *res) vbstack_to_dp(ctx, arg_cnt, &dp); - hres = disp_get_id(obj, identifier, &id); + hres = disp_get_id(obj, identifier, FALSE, &id); if(SUCCEEDED(hres)) hres = disp_call(ctx->script, obj, id, &dp, res); IDispatch_Release(obj); @@ -480,7 +489,7 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) return hres; } - hres = disp_get_id(obj, identifier, &id); + hres = disp_get_id(obj, identifier, FALSE, &id); if(SUCCEEDED(hres)) hres = disp_propput(ctx->script, obj, id, val.v); @@ -1084,6 +1093,9 @@ static void release_exec(exec_ctx_t *ctx) VariantClear(&ctx->ret_val); + if(ctx->this_obj) + IDispatch_Release(ctx->this_obj); + if(ctx->args) { for(i=0; i < ctx->func->arg_cnt; i++) VariantClear(ctx->args+i); @@ -1099,7 +1111,7 @@ static void release_exec(exec_ctx_t *ctx) heap_free(ctx->stack); } -HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT *res) +HRESULT exec_script(script_ctx_t *ctx, function_t *func, IDispatch *this_obj, DISPPARAMS *dp, VARIANT *res) { exec_ctx_t exec = {func->code_ctx}; vbsop_t op; @@ -1159,6 +1171,14 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT return E_OUTOFMEMORY; } + if(this_obj) + exec.this_obj = this_obj; + else if (ctx->host_global) + exec.this_obj = ctx->host_global; + else + exec.this_obj = (IDispatch*)&ctx->script_obj->IDispatchEx_iface; + IDispatch_AddRef(exec.this_obj); + exec.instr = exec.code->instrs + func->code_off; exec.script = ctx; exec.func = func; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 06542cd..9e4bc44 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -388,6 +388,7 @@ End Class Class TestClass Public Function publicFunction() + privateSub() publicFunction = 4 End Function diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 2b60926..666d04a 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -46,6 +46,15 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, BOOL search_private, return FALSE; } +static HRESULT vbdisp_get_id(vbdisp_t *This, BSTR name, BOOL search_private, DISPID *id) +{ + if(get_func_id(This, name, search_private, id)) + return S_OK; + + *id = -1; + return DISP_E_UNKNOWNNAME; +} + static inline vbdisp_t *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, vbdisp_t, IDispatchEx_iface); @@ -144,11 +153,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return E_NOTIMPL; } - if(get_func_id(This, bstrName, FALSE, pid)) - return S_OK; - - *pid = -1; - return DISP_E_UNKNOWNNAME; + return vbdisp_get_id(This, bstrName, FALSE, pid); } static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -176,7 +181,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return DISP_E_MEMBERNOTFOUND; } - return exec_script(This->desc->ctx, func, pdp, pvarRes); + return exec_script(This->desc->ctx, func, (IDispatch*)&This->IDispatchEx_iface, pdp, pvarRes); default: FIXME("flags %x\n", wFlags); return DISP_E_MEMBERNOTFOUND; @@ -247,6 +252,13 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; +static inline vbdisp_t *unsafe_impl_from_IDispatch(IDispatch *iface) +{ + return iface->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl + ? CONTAINING_RECORD(iface, vbdisp_t, IDispatchEx_iface) + : NULL; +} + HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) { vbdisp_t *vbdisp; @@ -269,13 +281,15 @@ HRESULT init_global(script_ctx_t *ctx) return create_vbdisp(&ctx->script_desc, &ctx->script_obj); } -HRESULT disp_get_id(IDispatch *disp, BSTR name, DISPID *id) +HRESULT disp_get_id(IDispatch *disp, BSTR name, BOOL search_private, DISPID *id) { IDispatchEx *dispex; + vbdisp_t *vbdisp; HRESULT hres; - if(disp->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl) - FIXME("properly handle builtin objects\n"); + vbdisp = unsafe_impl_from_IDispatch(disp); + if(vbdisp) + return vbdisp_get_id(vbdisp, name, search_private, id); hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(FAILED(hres)) { diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index cb28a9a..e0598a9 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -77,7 +77,7 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code) code->global_executed = TRUE; IActiveScriptSite_OnEnterScript(ctx->site); - hres = exec_script(ctx, &code->global_code, NULL, NULL); + hres = exec_script(ctx, &code->global_code, NULL, NULL, NULL); IActiveScriptSite_OnLeaveScript(ctx->site); return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 11a5862..1dcbc15 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -85,7 +85,7 @@ typedef struct { } vbdisp_t; HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); -HRESULT disp_get_id(IDispatch*,BSTR,DISPID*); +HRESULT disp_get_id(IDispatch*,BSTR,BOOL,DISPID*); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*); @@ -241,7 +241,7 @@ struct _vbscode_t { void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; -HRESULT exec_script(script_ctx_t*,function_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; +HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);

1 0

Jacek Caban : vbscript: Added stop statement semi-stub implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 8de5db6030c2bd229fba529842efb3d749d505f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de5db6030c2bd229fba52984… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:22:27 2011 +0200 vbscript: Added stop statement semi-stub implementation. --- dlls/vbscript/compile.c | 3 +++ dlls/vbscript/interp.c | 8 ++++++++ dlls/vbscript/parse.h | 3 ++- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 3 +++ dlls/vbscript/vbscript.h | 1 + 6 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 32707dc..10b2a9d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -615,6 +615,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_SET: hres = compile_assign_statement(ctx, (assign_statement_t*)stat, TRUE); break; + case STAT_STOP: + hres = push_instr(ctx, OP_stop) == -1 ? E_OUTOFMEMORY : S_OK; + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a0e926d..27da9d3 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -576,6 +576,14 @@ static HRESULT interp_ret(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_stop(exec_ctx_t *ctx) +{ + WARN("\n"); + + /* NOTE: this should have effect in debugging mode (that we don't support yet) */ + return S_OK; +} + static HRESULT interp_bool(exec_ctx_t *ctx) { const VARIANT_BOOL arg = ctx->instr->arg1.lng; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 94ba0cf..918a6db 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -97,7 +97,8 @@ typedef enum { STAT_EXITSUB, STAT_FUNC, STAT_IF, - STAT_SET + STAT_SET, + STAT_STOP } statement_type_t; typedef struct _statement_t { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3eacf2f..63423d1 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -157,6 +157,7 @@ Statement | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0); CHECK_ERROR; } | tSET MemberExpression Arguments_opt '=' Expression { $2->args = $3; $$ = new_set_statement(ctx, $2, $5); CHECK_ERROR; } + | tSTOP { $$ = new_statement(ctx, STAT_STOP, 0); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9e4bc44..3511707 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -376,6 +376,9 @@ Private Function TestPrivateFunc End Function Call TestPrivateFunc +' Stop has an effect only in debugging mode +Stop + set x = testObj Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x=testObj) = " & getVT(x)) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1dcbc15..26892db 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -169,6 +169,7 @@ typedef enum { X(set_ident, 1, ARG_BSTR, 0) \ X(set_member, 1, ARG_BSTR, 0) \ X(short, 1, ARG_INT, 0) \ + X(stop, 1, 0, 0) \ X(string, 1, ARG_STR, 0) \ X(sub, 1, 0, 0) \ X(xor, 1, 0, 0)

1 0

Michael Stefaniuc : d3d8: Remove pointless casts to the type of the casted expression.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 99f770e4efd09dd5b9cecf9f9bb7d7bb2bd64659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f770e4efd09dd5b9cecf9f9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 15 16:33:41 2011 +0200 d3d8: Remove pointless casts to the type of the casted expression. --- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 6b8caf1..0f40a0d 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -97,7 +97,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(IDirect3DCubeTexture8 TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice8 *)This->parentDevice; + *device = This->parentDevice; IDirect3DDevice8_AddRef(*device); TRACE("Returning device %p.\n", *device); diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 3424dcb..23e5036 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -134,7 +134,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(IDirect3DSurface8 *iface, return hr; } - *device = (IDirect3DDevice8 *)This->parentDevice; + *device = This->parentDevice; IDirect3DDevice8_AddRef(*device); TRACE("Returning device %p.\n", *device); diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index b74a8e4..2f62017 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -96,7 +96,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(IDirect3DTexture8 *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice8 *)This->parentDevice; + *device = This->parentDevice; IDirect3DDevice8_AddRef(*device); TRACE("Returning device %p.\n", *device); diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 356b47b..2ab5be2 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -95,7 +95,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(IDirect3DVolumeTextu TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice8 *)This->parentDevice; + *device = This->parentDevice; IDirect3DDevice8_AddRef(*device); TRACE("Returning device %p.\n", *device);

1 0

Alistair Leslie-Hughes : msxml3: Move xmlparser.idl to msxml3.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 54b37b8c41206ab301fd04623d0a034ff543bc52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b37b8c41206ab301fd04623… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 15 22:18:28 2011 +1000 msxml3: Move xmlparser.idl to msxml3. --- .gitignore | 2 +- dlls/msxml3/Makefile.in | 2 ++ {include => dlls/msxml3}/xmlparser.idl | 0 include/Makefile.in | 3 +-- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b401369..b1d82eb 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,7 @@ dlls/msi/sql.tab.c dlls/msi/sql.tab.h dlls/mstask/mstask_local.h dlls/mstask/mstask_local_i.c +dlls/msxml3/xmlparser.h dlls/msxml3/xslpattern.tab.c dlls/msxml3/xslpattern.tab.h dlls/msxml3/xslpattern.yy.c @@ -234,7 +235,6 @@ include/wpcapi.h include/wtypes.h include/wuapi.h include/xmllite.h -include/xmlparser.h libs/wpp/ppl.yy.c libs/wpp/ppy.tab.c libs/wpp/ppy.tab.h diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 889ef64..7e0add1 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -44,6 +44,8 @@ RC_SRCS = \ schemas.rc \ version.rc +IDL_H_SRCS = xmlparser.idl + IDL_TLB_SRCS = msxml3_v1.idl @MAKE_DLL_RULES@ diff --git a/include/xmlparser.idl b/dlls/msxml3/xmlparser.idl similarity index 100% rename from include/xmlparser.idl rename to dlls/msxml3/xmlparser.idl diff --git a/include/Makefile.in b/include/Makefile.in index 5223e41..c405d64 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -104,8 +104,7 @@ PUBLIC_IDL_H_SRCS = \ wpcapi.idl \ wtypes.idl \ wuapi.idl \ - xmllite.idl \ - xmlparser.idl + xmllite.idl IDL_TLB_SRCS = \ stdole2.idl

1 0

Francois Gouget : po: Remove an English string from the Serbian (Cyrillic) translation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: bc58d3d143cd5c5be0b5e2da6b3894212cbad2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc58d3d143cd5c5be0b5e2da6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 10:57:27 2011 +0200 po: Remove an English string from the Serbian (Cyrillic) translation. --- po/sr_RS(a)cyrillic.po | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/po/sr_RS(a)cyrillic.po b/po/sr_RS(a)cyrillic.po index edb71ac..17f43c4 100644 --- a/po/sr_RS(a)cyrillic.po +++ b/po/sr_RS(a)cyrillic.po @@ -6980,19 +6980,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine 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.\n" -"\n" -"Wine 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.\n" -"\n" -"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." #: shell32.rc:266 msgid "Wine License"

1 0

Francois Gouget : po: Remove English strings from the Serbian (Latin) translation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: de77f0648e1bcb91fd018e0dd17765f69925cfba URL: http://source.winehq.org/git/wine.git/?a=commit;h=de77f0648e1bcb91fd018e0dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 10:57:30 2011 +0200 po: Remove English strings from the Serbian (Latin) translation. --- po/sr_RS(a)latin.po | 35 ++++++++++------------------------- 1 files changed, 10 insertions(+), 25 deletions(-) diff --git a/po/sr_RS(a)latin.po b/po/sr_RS(a)latin.po index 6b888a3..6e6e3f5 100644 --- a/po/sr_RS(a)latin.po +++ b/po/sr_RS(a)latin.po @@ -4314,9 +4314,8 @@ msgid "Security DB commit failure\n" msgstr "" #: winerror.mc:2256 -#, fuzzy msgid "Account is built-in\n" -msgstr "native, builtin" +msgstr "" #: winerror.mc:2261 msgid "Group is built-in\n" @@ -5781,7 +5780,7 @@ msgstr "Wine Video 1 video kodek" #: oleacc.rc:27 msgid "unknown object" -msgstr "unknown object" +msgstr "" #: oleacc.rc:28 msgid "title bar" @@ -7029,19 +7028,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine 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.\n" -"\n" -"Wine 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.\n" -"\n" -"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." #: shell32.rc:266 msgid "Wine License" @@ -7926,7 +7912,7 @@ msgstr "&Digitalni" #: clock.rc:32 notepad.rc:50 winefile.rc:64 wordpad.rc:81 msgid "&Font..." -msgstr "&Font..." +msgstr "" #: clock.rc:34 msgid "&Without Titlebar" @@ -8503,7 +8489,7 @@ msgstr "" #: ipconfig.rc:29 msgid "%s adapter %s\n" -msgstr "%s adapter %s\n" +msgstr "" #: ipconfig.rc:30 msgid "Ethernet" @@ -9450,9 +9436,8 @@ msgid "Modify Binary Data..." msgstr "" #: regedit.rc:109 -#, fuzzy msgid "&Export..." -msgstr "&Font..." +msgstr "" #: regedit.rc:134 msgid "Contains commands for working with the whole registry" @@ -10406,7 +10391,7 @@ msgstr "Izaberite temu" #: winecfg.rc:45 msgid "Folder" -msgstr "Folder" +msgstr "" #: winecfg.rc:46 msgid "Links to" @@ -10580,7 +10565,7 @@ msgstr "Tekst menija" #: winecfg.rc:100 msgid "Scrollbar" -msgstr "Scrollbar" +msgstr "" #: winecfg.rc:101 msgid "Selection Background" @@ -10668,7 +10653,7 @@ msgstr "Kontrola alternativne pozadine" #: winecfg.rc:122 msgid "Hot Tracked Item" -msgstr "Hot Tracked Item" +msgstr "" #: winecfg.rc:123 msgid "Active Title Bar Gradient" @@ -11044,7 +11029,7 @@ msgstr "Uvek na &vrhu" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Info..." +msgstr "" #: winhlp32.rc:64 msgid "Annotation..." @@ -11068,7 +11053,7 @@ msgstr "Pregled" #: winhlp32.rc:84 msgid "&Index" -msgstr "&Index" +msgstr "" #: winhlp32.rc:88 msgid "Help files (*.hlp)"

1 0

Hans Leidekker : msi: Improve parsing of the package platform.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 6ae7061645eb245e49dacb4757b329b6783a10e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae7061645eb245e49dacb475… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 15 11:48:15 2011 +0200 msi: Improve parsing of the package platform. --- dlls/msi/package.c | 5 +++++ dlls/msi/tests/install.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1025607..4b59425 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1280,6 +1280,7 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) return ERROR_PATCH_PACKAGE_INVALID; } *p = 0; + if ((q = strchrW( template, ',' ))) *q = 0; if (!template[0] || !strcmpW( template, szIntel )) package->platform = PLATFORM_INTEL; else if (!strcmpW( template, szIntel64 )) @@ -1329,6 +1330,10 @@ static UINT validate_package( MSIPACKAGE *package ) BOOL is_wow64; UINT i; + if (package->platform == PLATFORM_INTEL64) + { + return ERROR_INSTALL_PLATFORM_UNSUPPORTED; + } IsWow64Process( GetCurrentProcess(), &is_wow64 ); if (package->platform == PLATFORM_X64) { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 04c709f..b1db7e4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6111,6 +6111,44 @@ static void test_package_validation(void) ok(delete_pf("msitest", FALSE), "directory does not exist\n"); DeleteFile(msifile); + create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel,9999;9999"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_INSTALL_LANGUAGE_UNSUPPORTED, "Expected ERROR_INSTALL_LANGUAGE_UNSUPPORTED, got %u\n", r); + + DeleteFile(msifile); + create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel,1033;9999"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_INSTALL_LANGUAGE_UNSUPPORTED, "Expected ERROR_INSTALL_LANGUAGE_UNSUPPORTED, got %u\n", r); + + DeleteFile(msifile); + create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel,9999;1033"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n"); + ok(delete_pf("msitest", FALSE), "directory does not exist\n"); + + DeleteFile(msifile); + create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel64,9999;1033"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_INSTALL_PLATFORM_UNSUPPORTED, "Expected ERROR_INSTALL_PLATFORM_UNSUPPORTED, got %u\n", r); + + DeleteFile(msifile); + create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel32,1033;1033"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_INSTALL_PLATFORM_UNSUPPORTED, "Expected ERROR_INSTALL_PLATFORM_UNSUPPORTED, got %u\n", r); + + DeleteFile(msifile); + create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel32,9999;1033"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_INSTALL_PLATFORM_UNSUPPORTED, "Expected ERROR_INSTALL_PLATFORM_UNSUPPORTED, got %u\n", r); + + DeleteFile(msifile); create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel;9999"); r = MsiInstallProductA(msifile, NULL);

1 0

Alexandre Julliard : winex11: Get rid of the xrender_info structure.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: ce63099a140f3dd30d7cabe098805e271b1b9f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce63099a140f3dd30d7cabe09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 13:21:45 2011 +0200 winex11: Get rid of the xrender_info structure. --- dlls/winex11.drv/x11drv.h | 3 - dlls/winex11.drv/xrender.c | 174 ++++++++++++++++++-------------------------- 2 files changed, 71 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce63099a140f3dd30d7ca…

1 0

Alexandre Julliard : winex11: Store the XRender picture formats in a global array instead of in the format structure .
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 8860159f1cd1fac12c3d24b779af02d53c23f2d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8860159f1cd1fac12c3d24b77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 15:10:17 2011 +0200 winex11: Store the XRender picture formats in a global array instead of in the format structure. --- dlls/winex11.drv/xrender.c | 96 +++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8860159f1cd1fac12c3d2…

1 0