September 2010 - Wine-commits

Gerald Pfeifer : setupx.dll16: Simplify VCP_CopyFiles by removing a set, but never read, variable.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 053ba796e7dca37c0659c0f15a4589bccf2274c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053ba796e7dca37c0659c0f15… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 7 21:03:00 2010 +0200 setupx.dll16: Simplify VCP_CopyFiles by removing a set, but never read, variable. --- dlls/setupx.dll16/virtcopy.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index ffb54f3..b80a5be 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -437,11 +437,11 @@ static RETERR16 VCP_CheckPaths(void) static RETERR16 VCP_CopyFiles(void) { char fn_src[MAX_PATH], fn_dst[MAX_PATH]; - RETERR16 res = OK, cbres; + RETERR16 res = OK; DWORD n; LPVIRTNODE lpvn; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCOPYSTART, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATCOPYSTART, 0, 0, VCP_MsgRef); for (n = 0; n < vn_num; n++) { lpvn = pvnlist[n]; @@ -451,7 +451,7 @@ static RETERR16 VCP_CopyFiles(void) strcpy(fn_dst, VcpExplain16(lpvn, VCPEX_DST_FULL)); /* FIXME: what is this VCPM_VSTATWRITE here for ? * I guess it's to signal successful destination file creation */ - cbres = VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); /* FIXME: need to do the file copy in small chunks for notifications */ TRACE("copying '%s' to '%s'\n", fn_src, fn_dst); @@ -464,12 +464,12 @@ static RETERR16 VCP_CopyFiles(void) } vcp_status.prgFileRead.dwSoFar++; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATREAD, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATREAD, 0, 0, VCP_MsgRef); vcp_status.prgFileWrite.dwSoFar++; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); } - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCOPYEND, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATCOPYEND, 0, 0, VCP_MsgRef); return res; }

1 0

Luca Bennati : ipconfig: Update Italian translation.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 167a940e9d8626608f574113e56d56d58d9ed941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167a940e9d8626608f574113e… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Sep 7 21:11:31 2010 +0200 ipconfig: Update Italian translation. --- programs/ipconfig/It.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/It.rc b/programs/ipconfig/It.rc index 0a7bf40..1784026 100644 --- a/programs/ipconfig/It.rc +++ b/programs/ipconfig/It.rc @@ -46,4 +46,6 @@ STRINGTABLE STRING_DESCRIPTION, "Descrizione" STRING_PHYS_ADDR, "Indirizzo fisico" STRING_DHCP_ENABLED, "DHCP abilitato" + STRING_YES, "Sì" + STRING_NO, "No" }

1 0

Michael Stefaniuc : oleaut32: The function pointer should be const and not the return value.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: ec382f43452890354b9edd30ecb7d293045bb8c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec382f43452890354b9edd30e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 7 17:51:29 2010 +0200 oleaut32: The function pointer should be const and not the return value. --- dlls/oleaut32/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0a3ad09..0fb3cee 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5743,7 +5743,7 @@ __ASM_GLOBAL_FUNC( call_method, "ret" ) /* same function but returning floating point */ -static const double (*call_double_method)(void*,int,const DWORD*,int*) = (void *)call_method; +static double (* const call_double_method)(void*,int,const DWORD*,int*) = (void *)call_method; /* ITypeInfo::Invoke * @@ -5821,7 +5821,7 @@ __ASM_GLOBAL_FUNC( call_method, "ret") /* same function but returning floating point */ -static const double (CDECL *call_double_method)(void*,int,const DWORD_PTR*) = (void *)call_method; +static double (CDECL * const call_double_method)(void*,int,const DWORD_PTR*) = (void *)call_method; #endif /* __x86_64__ */

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in put_nodeValue implementations.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 9413fab39ea86a55d2e1e3fb119599436138da42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9413fab39ea86a55d2e1e3fb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 15:27:31 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in put_nodeValue implementations. --- dlls/msxml3/attribute.c | 14 ++++++-- dlls/msxml3/cdata.c | 7 +++- dlls/msxml3/comment.c | 10 ++++-- dlls/msxml3/docfrag.c | 5 ++- dlls/msxml3/domdoc.c | 5 ++- dlls/msxml3/element.c | 5 ++- dlls/msxml3/entityref.c | 5 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 66 +++++++++++++++--------------------------- dlls/msxml3/pi.c | 6 ++-- dlls/msxml3/text.c | 10 ++++-- 11 files changed, 67 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9413fab39ea86a55d2e1e…

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_nodeType and get_nodeParent implementations.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 6e76c894e8a38e6039bfba1cca5e343c26b44118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e76c894e8a38e6039bfba1cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 15:28:21 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_nodeType and get_nodeParent implementations. --- dlls/msxml3/attribute.c | 6 +++++- dlls/msxml3/cdata.c | 11 +++++++++-- dlls/msxml3/comment.c | 11 +++++++++-- dlls/msxml3/docfrag.c | 11 +++++++++-- dlls/msxml3/domdoc.c | 11 +++++++++-- dlls/msxml3/element.c | 11 +++++++++-- dlls/msxml3/entityref.c | 11 +++++++++-- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 29 +++++++++++++++-------------- dlls/msxml3/pi.c | 11 +++++++++-- dlls/msxml3/text.c | 11 +++++++++-- 11 files changed, 93 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e76c894e8a38e6039bfb…

1 0

Francois Gouget : msi/tests: Fix compilation on systems that don' t support nameless unions or structs.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: b66eb177af45f0b4b6082d5d286e55fd6a07cd1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66eb177af45f0b4b6082d5d2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 7 15:28:27 2010 +0200 msi/tests: Fix compilation on systems that don't support nameless unions or structs. --- dlls/msi/tests/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 225a0e3..fef79de 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9666,7 +9666,7 @@ static void test_installprops(void) if (pGetSystemInfo) { pGetSystemInfo(&si); - if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { buf[0] = 0; size = MAX_PATH;

1 0

Jacek Caban : jscript: Added a helper function for setting VARIANT value to jsdisp_t.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 2ae0f44033049d4b747fce61fa06a8b4980abe2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae0f44033049d4b747fce61f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 15:41:40 2010 +0200 jscript: Added a helper function for setting VARIANT value to jsdisp_t. --- dlls/jscript/array.c | 35 ++++++++++++----------------------- dlls/jscript/bool.c | 3 +-- dlls/jscript/date.c | 3 +-- dlls/jscript/dispex.c | 7 ++----- dlls/jscript/engine.c | 15 +++++---------- dlls/jscript/error.c | 14 ++++---------- dlls/jscript/function.c | 13 +++++-------- dlls/jscript/global.c | 6 ++---- dlls/jscript/jscript.h | 11 +++++++++++ dlls/jscript/number.c | 3 +-- dlls/jscript/object.c | 3 +-- dlls/jscript/regexp.c | 24 +++++++++--------------- dlls/jscript/string.c | 11 ++++------- 13 files changed, 58 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ae0f44033049d4b747fc…

1 0

Jacek Caban : jscript: jsdisp_t to IDispatch casts clean up.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: ac8d2f1fae0eb60f0ea5b21dee1ce6c5806ddc95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8d2f1fae0eb60f0ea5b21de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 15:42:01 2010 +0200 jscript: jsdisp_t to IDispatch casts clean up. --- dlls/jscript/dispex.c | 2 +- dlls/jscript/engine.c | 10 +++++----- dlls/jscript/function.c | 6 +++--- dlls/jscript/jscript.c | 4 ++-- dlls/jscript/jsutils.c | 8 ++++---- dlls/jscript/regexp.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 9739aa8..be8967a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -285,7 +285,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t TRACE("call %s %p\n", debugstr_w(prop->name), V_DISPATCH(&prop->u.var)); - hres = set_this(&new_dp, dp, (IDispatch*)_IDispatchEx_(jsthis)); + hres = set_this(&new_dp, dp, to_disp(jsthis)); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0556d69..4bd4bfd 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -194,7 +194,7 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, IDispatch *this_obj, jsdisp_t else if(script_ctx->host_global) ctx->this_obj = script_ctx->host_global; else - ctx->this_obj = (IDispatch*)_IDispatchEx_(script_ctx->global); + ctx->this_obj = to_disp(script_ctx->global); IDispatch_AddRef(ctx->this_obj); IDispatchEx_AddRef(_IDispatchEx_(var_disp)); @@ -517,13 +517,13 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, js } if(scope) { - exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(scope->obj), id); + exprval_set_idref(ret, to_disp(scope->obj), id); return S_OK; } hres = jsdisp_get_id(ctx->parser->script->global, identifier, 0, &id); if(SUCCEEDED(hres)) { - exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(ctx->parser->script->global), id); + exprval_set_idref(ret, to_disp(ctx->parser->script->global), id); return S_OK; } @@ -566,7 +566,7 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, js if(FAILED(hres)) return hres; - exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(ctx->parser->script->global), id); + exprval_set_idref(ret, to_disp(ctx->parser->script->global), id); return S_OK; } @@ -2017,7 +2017,7 @@ static HRESULT instanceof_eval(exec_ctx_t *ctx, VARIANT *inst, VARIANT *objv, js if(V_VT(inst) == VT_DISPATCH) tmp = iface_to_jsdisp((IUnknown*)V_DISPATCH(inst)); for(iter = tmp; iter; iter = iter->prototype) { - hres = disp_cmp(V_DISPATCH(&var), (IDispatch*)_IDispatchEx_(iter), &b); + hres = disp_cmp(V_DISPATCH(&var), to_disp(iter), &b); if(FAILED(hres)) break; if(b) { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 8b5638d..56cd2b2 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -196,7 +196,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis return E_FAIL; } - hres = create_arguments(ctx, (IDispatch*)_IDispatchEx_(&function->dispex), + hres = create_arguments(ctx, to_disp(&function->dispex), dp, ei, caller, &arg_disp); if(FAILED(hres)) return hres; @@ -239,7 +239,7 @@ static HRESULT invoke_constructor(script_ctx_t *ctx, FunctionInstance *function, if(FAILED(hres)) return hres; - hres = invoke_source(ctx, function, (IDispatch*)_IDispatchEx_(this_obj), dp, &var, ei, caller); + hres = invoke_source(ctx, function, to_disp(this_obj), dp, &var, ei, caller); if(FAILED(hres)) { jsdisp_release(this_obj); return hres; @@ -793,7 +793,7 @@ static HRESULT construct_function(script_ctx_t *ctx, DISPPARAMS *dp, jsexcept_t if(FAILED(hres)) return hres; - *ret = (IDispatch*)_IDispatchEx_(function); + *ret = to_disp(function); return S_OK; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 3b15818..079db3d 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -558,7 +558,7 @@ static HRESULT WINAPI JScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR return E_UNEXPECTED; } - *ppdisp = (IDispatch*)_IDispatchEx_(This->ctx->global); + *ppdisp = to_disp(This->ctx->global); IDispatch_AddRef(*ppdisp); return S_OK; } @@ -779,7 +779,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars if(FAILED(hres)) return hres; - *ppdisp = (IDispatch*)_IDispatchEx_(dispex); + *ppdisp = to_disp(dispex); return S_OK; } diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 602a1a8..3024f3b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -602,7 +602,7 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) if(FAILED(hres)) return hres; - *disp = (IDispatch*)_IDispatchEx_(dispex); + *disp = to_disp(dispex); break; case VT_I4: case VT_R8: @@ -610,7 +610,7 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) if(FAILED(hres)) return hres; - *disp = (IDispatch*)_IDispatchEx_(dispex); + *disp = to_disp(dispex); break; case VT_DISPATCH: if(V_DISPATCH(v)) { @@ -623,7 +623,7 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) if(FAILED(hres)) return hres; - *disp = (IDispatch*)_IDispatchEx_(obj); + *disp = to_disp(obj); } break; case VT_BOOL: @@ -631,7 +631,7 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) if(FAILED(hres)) return hres; - *disp = (IDispatch*)_IDispatchEx_(dispex); + *disp = to_disp(dispex); break; default: FIXME("unsupported vt %d\n", V_VT(v)); diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 82a0a94..5d75144 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3638,7 +3638,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res return hres; } - *ret = (IDispatch*)_IDispatchEx_(array); + *ret = to_disp(array); return S_OK; }

1 0

Jacek Caban : jscript: Addd jsdisp_addref helper function.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: f46f9261349e121d1d9a1dfb366083d90eefefc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46f9261349e121d1d9a1dfb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 15:42:34 2010 +0200 jscript: Addd jsdisp_addref helper function. --- dlls/jscript/array.c | 6 +++--- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/engine.c | 4 ++-- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 5 +++++ 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index f267b38..99127d4 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -506,8 +506,8 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP } if(retv) { + jsdisp_addref(jsthis); var_set_jsdisp(retv, jsthis); - IDispatch_AddRef(V_DISPATCH(retv)); } return S_OK; @@ -745,8 +745,8 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR if(cmp_func) jsdisp_release(cmp_func); if(retv) { + jsdisp_addref(jsthis); var_set_jsdisp(retv, jsthis); - IDispatch_AddRef(V_DISPATCH(retv)); } return S_OK; } @@ -850,8 +850,8 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR return hres; if(retv) { + jsdisp_addref(jsthis); var_set_jsdisp(retv, jsthis); - IDispatch_AddRef(V_DISPATCH(retv)); } return S_OK; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index be8967a..368cb6e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -437,7 +437,7 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, *ppv = _IDispatchEx_(This); }else if(IsEqualGUID(&IID_IDispatchJS, riid)) { TRACE("(%p)->(IID_IDispatchJS %p)\n", This, ppv); - IUnknown_AddRef(_IDispatchEx_(This)); + jsdisp_addref(This); *ppv = This; return S_OK; }else { @@ -755,7 +755,7 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b dispex->prototype = prototype; if(prototype) - IDispatchEx_AddRef(_IDispatchEx_(prototype)); + jsdisp_addref(prototype); dispex->prop_cnt = 1; dispex->props[0].name = NULL; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 4bd4bfd..8aed4db 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -143,7 +143,7 @@ HRESULT scope_push(scope_chain_t *scope, jsdisp_t *obj, scope_chain_t **ret) new_scope->ref = 1; - IDispatchEx_AddRef(_IDispatchEx_(obj)); + jsdisp_addref(obj); new_scope->obj = obj; if(scope) { @@ -197,7 +197,7 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, IDispatch *this_obj, jsdisp_t ctx->this_obj = to_disp(script_ctx->global); IDispatch_AddRef(ctx->this_obj); - IDispatchEx_AddRef(_IDispatchEx_(var_disp)); + jsdisp_addref(var_disp); ctx->var_disp = var_disp; if(scope) { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 56cd2b2..2bcc918 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -547,7 +547,7 @@ static HRESULT Function_arguments(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags switch(flags) { case DISPATCH_PROPERTYGET: { if(function->arguments) { - IDispatchEx_AddRef(_IDispatchEx_(function->arguments)); + jsdisp_addref(function->arguments); var_set_jsdisp(retv, function->arguments); }else { V_VT(retv) = VT_NULL; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index eef57c4..21d9201 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -112,8 +112,8 @@ static HRESULT constructor_call(jsdisp_t *constr, WORD flags, DISPPARAMS *dp, if(flags != DISPATCH_PROPERTYGET) return jsdisp_call_value(constr, flags, dp, retv, ei, sp); + jsdisp_addref(constr); var_set_jsdisp(retv, constr); - IDispatchEx_AddRef(_IDispatchEx_(constr)); return S_OK; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 5ed7e8f..e9318e5 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -192,6 +192,11 @@ static inline IDispatch *to_disp(jsdisp_t *jsdisp) return (IDispatch*)&jsdisp->lpIDispatchExVtbl; } +static inline void jsdisp_addref(jsdisp_t *jsdisp) +{ + IDispatchEx_AddRef(_IDispatchEx_(jsdisp)); +} + static inline void jsdisp_release(jsdisp_t *jsdisp) { IDispatchEx_Release(_IDispatchEx_(jsdisp));

1 0

André Hentschel : winebuild: Don' t segfault when run without arguments.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: d0f434eb3ac343d522ca4319abfd2df78367a8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f434eb3ac343d522ca4319a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 7 16:36:55 2010 +0200 winebuild: Don't segfault when run without arguments. --- tools/winebuild/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f6c04fd..0fc351c 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -142,13 +142,13 @@ static void set_dll_file_name( const char *name, DLLSPEC *spec ) /* set the dll name from the file name */ static void init_dll_name( DLLSPEC *spec ) { - if (!spec->file_name) + if (!spec->file_name && output_file_name) { char *p; spec->file_name = xstrdup( output_file_name ); if ((p = strrchr( spec->file_name, '.' ))) *p = 0; } - if (!spec->dll_name) /* set default name from file name */ + if (!spec->dll_name && spec->file_name) /* set default name from file name */ { char *p; spec->dll_name = xstrdup( spec->file_name );

1 0