wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Jacek Caban : vbscript: Leave assigning value up to add_dynamic_var callers.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 62bc8aeb0ff863c31d804406853f351659753c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62bc8aeb0ff863c31d8044068… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:41:17 2015 +0100 vbscript: Leave assigning value up to add_dynamic_var callers. --- dlls/vbscript/interp.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d2152cd..1fe7304 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -220,13 +220,12 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, - BOOL is_const, VARIANT *val, BOOL own_val, VARIANT **out_var) + BOOL is_const, VARIANT **out_var) { dynamic_var_t *new_var; heap_pool_t *heap; WCHAR *str; unsigned size; - HRESULT hres; heap = ctx->func->type == FUNC_GLOBAL ? &ctx->script->heap : &ctx->heap; @@ -241,15 +240,7 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, memcpy(str, name, size); new_var->name = str; new_var->is_const = is_const; - - if(own_val) { - new_var->v = *val; - }else { - V_VT(&new_var->v) = VT_EMPTY; - hres = VariantCopy(&new_var->v, val); - if(FAILED(hres)) - return hres; - } + V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { new_var->next = ctx->script->global_vars; @@ -259,9 +250,7 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, ctx->dynamic_vars = new_var; } - if(out_var) - *out_var = &new_var->v; - + *out_var = &new_var->v; return S_OK; } @@ -620,9 +609,8 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) break; case REF_NONE: if(res && !ctx->func->code_ctx->option_explicit && arg_cnt == 0) { - VARIANT v, *new; - VariantInit(&v); - hres = add_dynamic_var(ctx, identifier, FALSE, &v, FALSE, &new); + VARIANT *new; + hres = add_dynamic_var(ctx, identifier, FALSE, &new); if(FAILED(hres)) return hres; V_VT(res) = VT_BYREF|VT_VARIANT; @@ -778,13 +766,17 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS * FIXME("throw exception\n"); hres = E_FAIL; }else { + VARIANT *new_var; + if(arg_cnt(dp)) { FIXME("arg_cnt %d not supported\n", arg_cnt(dp)); return E_NOTIMPL; } TRACE("creating variable %s\n", debugstr_w(name)); - hres = add_dynamic_var(ctx, name, FALSE, dp->rgvarg, FALSE, NULL); + hres = add_dynamic_var(ctx, name, FALSE, &new_var); + if(SUCCEEDED(hres)) + hres = VariantCopyInd(new_var, dp->rgvarg); } } @@ -920,7 +912,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) static HRESULT interp_const(exec_ctx_t *ctx) { BSTR arg = ctx->instr->arg1.bstr; - variant_val_t val; + VARIANT *v; ref_t ref; HRESULT hres; @@ -937,11 +929,16 @@ static HRESULT interp_const(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_pop_val(ctx, &val); + hres = stack_assume_val(ctx, 0); if(FAILED(hres)) return hres; - return add_dynamic_var(ctx, arg, TRUE, val.v, val.owned, NULL); + hres = add_dynamic_var(ctx, arg, TRUE, &v); + if(FAILED(hres)) + return hres; + + *v = *stack_pop(ctx); + return S_OK; } static HRESULT interp_val(exec_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Fail to set non-object values with DISPATCH_PROPERTYPUTREF flag.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 86283b31db9c3fe43f42d024612365c4cd3b7dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86283b31db9c3fe43f42d0246… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:40:59 2015 +0100 vbscript: Fail to set non-object values with DISPATCH_PROPERTYPUTREF flag. --- dlls/vbscript/vbdisp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a07020b..eec0bf6 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -116,6 +116,9 @@ static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD fla *v = value; *is_owned = TRUE; } + }else if(!(flags & DISPATCH_PROPERTYPUT)) { + WARN("%s can't be assigned without DISPATCH_PROPERTYPUT flag\n", debugstr_variant(v)); + return DISP_E_EXCEPTION; } return S_OK;

1 0

Jacek Caban : vbscript: Convert VT_DISPATCH propput value to trivial value if DISPATCH_PROPERTYPUTREF is not set.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 4bca1665c4dcd6e1c58322b8cb4e0b0ca9915033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bca1665c4dcd6e1c58322b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:40:51 2015 +0100 vbscript: Convert VT_DISPATCH propput value to trivial value if DISPATCH_PROPERTYPUTREF is not set. --- dlls/vbscript/vbdisp.c | 73 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 18ba966..a07020b 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -85,19 +85,43 @@ HRESULT vbdisp_get_id(vbdisp_t *This, BSTR name, vbdisp_invoke_type_t invoke_typ return DISP_E_UNKNOWNNAME; } -static VARIANT *get_propput_arg(const DISPPARAMS *dp) +static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD flags, VARIANT *v, BOOL *is_owned) { unsigned i; for(i=0; i < dp->cNamedArgs; i++) { if(dp->rgdispidNamedArgs[i] == DISPID_PROPERTYPUT) - return dp->rgvarg+i; + break; + } + if(i == dp->cNamedArgs) { + WARN("no value to set\n"); + return DISP_E_PARAMNOTOPTIONAL; + } + + *v = dp->rgvarg[i]; + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) + *v = *V_VARIANTREF(v); + *is_owned = FALSE; + + if(V_VT(v) == VT_DISPATCH) { + if(!(flags & DISPATCH_PROPERTYPUTREF)) { + DISPPARAMS val_dp = {NULL}; + VARIANT value; + HRESULT hres; + + hres = disp_call(ctx, V_DISPATCH(v), DISPID_VALUE, &val_dp, &value); + if(FAILED(hres)) + return hres; + + *v = value; + *is_owned = TRUE; + } } - return NULL; + return S_OK; } -static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIANT *res) +static HRESULT invoke_variant_prop(script_ctx_t *ctx, VARIANT *v, WORD flags, DISPPARAMS *dp, VARIANT *res) { HRESULT hres; @@ -115,13 +139,12 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA case DISPATCH_PROPERTYPUT: case DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { - VARIANT *put_val; + VARIANT put_val; + BOOL own_val; - put_val = get_propput_arg(dp); - if(!put_val) { - WARN("no value to set\n"); - return DISP_E_PARAMNOTOPTIONAL; - } + hres = get_propput_arg(ctx, dp, flags, &put_val, &own_val); + if(FAILED(hres)) + return hres; if(arg_cnt(dp)) { FIXME("Arguments not supported\n"); @@ -131,7 +154,10 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA if(res) V_VT(res) = VT_EMPTY; - hres = VariantCopyInd(v, put_val); + if(own_val) + *v = put_val; + else + hres = VariantCopyInd(v, &put_val); break; } @@ -414,28 +440,31 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_PROPERTYPUT: case DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { - VARIANT *put_val; DISPPARAMS dp = {NULL, NULL, 1, 0}; + BOOL needs_release; + VARIANT put_val; + HRESULT hres; if(arg_cnt(pdp)) { FIXME("arguments not implemented\n"); return E_NOTIMPL; } - put_val = get_propput_arg(pdp); - if(!put_val) { - WARN("no value to set\n"); - return DISP_E_PARAMNOTOPTIONAL; - } + hres = get_propput_arg(This->desc->ctx, pdp, wFlags, &put_val, &needs_release); + if(FAILED(hres)) + return hres; - dp.rgvarg = put_val; - func = This->desc->funcs[id].entries[V_VT(put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + dp.rgvarg = &put_val; + func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; if(!func) { FIXME("no letter/setter\n"); return DISP_E_MEMBERNOTFOUND; } - return exec_script(This->desc->ctx, func, This, &dp, NULL); + hres = exec_script(This->desc->ctx, func, This, &dp, NULL); + if(needs_release) + VariantClear(&put_val); + return hres; } default: FIXME("flags %x\n", wFlags); @@ -444,7 +473,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } if(id < This->desc->prop_cnt + This->desc->func_cnt) - return invoke_variant_prop(This->props+(id-This->desc->func_cnt), wFlags, pdp, pvarRes); + return invoke_variant_prop(This->desc->ctx, This->props+(id-This->desc->func_cnt), wFlags, pdp, pvarRes); if(This->desc->builtin_prop_cnt) { unsigned min = 0, max = This->desc->builtin_prop_cnt-1, i; @@ -849,7 +878,7 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return E_NOTIMPL; } - return invoke_variant_prop(&ident->u.var->v, wFlags, pdp, pvarRes); + return invoke_variant_prop(This->ctx, &ident->u.var->v, wFlags, pdp, pvarRes); } switch(wFlags) {

1 0

Jacek Caban : vbscript: Pass DISPATCH_PROPERTYPUTREF flag to InvokeEx when apropriate.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 571b09ce42dbe43b3f1b2bb8b414d5896fbf8a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571b09ce42dbe43b3f1b2bb8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:40:36 2015 +0100 vbscript: Pass DISPATCH_PROPERTYPUTREF flag to InvokeEx when apropriate. --- dlls/vbscript/interp.c | 14 +++++++------- dlls/vbscript/vbdisp.c | 6 +++--- dlls/vbscript/vbscript.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4b45006..d2152cd 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -709,7 +709,7 @@ static HRESULT interp_mcallv(exec_ctx_t *ctx) return do_mcall(ctx, NULL); } -static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, DISPPARAMS *dp) +static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS *dp) { ref_t ref; HRESULT hres; @@ -762,7 +762,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, DISPPARAMS *dp) break; } case REF_DISP: - hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, dp); + hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, flags, dp); break; case REF_FUNC: FIXME("functions not implemented\n"); @@ -805,7 +805,7 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) return hres; vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); - hres = assign_ident(ctx, arg, &dp); + hres = assign_ident(ctx, arg, DISPATCH_PROPERTYPUT, &dp); if(FAILED(hres)) return hres; @@ -832,7 +832,7 @@ static HRESULT interp_set_ident(exec_ctx_t *ctx) return hres; vbstack_to_dp(ctx, 0, TRUE, &dp); - hres = assign_ident(ctx, ctx->instr->arg1.bstr, &dp); + hres = assign_ident(ctx, ctx->instr->arg1.bstr, DISPATCH_PROPERTYPUTREF, &dp); if(FAILED(hres)) return hres; @@ -867,7 +867,7 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) hres = disp_get_id(obj, identifier, VBDISP_LET, FALSE, &id); if(SUCCEEDED(hres)) { vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); - hres = disp_propput(ctx->script, obj, id, &dp); + hres = disp_propput(ctx->script, obj, id, DISPATCH_PROPERTYPUT, &dp); } if(FAILED(hres)) return hres; @@ -908,7 +908,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) hres = disp_get_id(obj, identifier, VBDISP_SET, FALSE, &id); if(SUCCEEDED(hres)) { vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); - hres = disp_propput(ctx->script, obj, id, &dp); + hres = disp_propput(ctx->script, obj, id, DISPATCH_PROPERTYPUTREF, &dp); } if(FAILED(hres)) return hres; @@ -1176,7 +1176,7 @@ static HRESULT interp_enumnext(exec_ctx_t *ctx) return hres; do_continue = hres == S_OK; - hres = assign_ident(ctx, ident, &dp); + hres = assign_ident(ctx, ident, DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF, &dp); VariantClear(&v); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c9d318e..18ba966 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1070,7 +1070,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, return hres; } -HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp) +HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp) { IDispatchEx *dispex; EXCEPINFO ei = {0}; @@ -1078,13 +1078,13 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS * hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, dp, NULL, &ei, NULL /* FIXME! */); + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, NULL, &ei, NULL /* FIXME! */); IDispatchEx_Release(dispex); }else { ULONG err = 0; TRACE("using IDispatch\n"); - hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, DISPATCH_PROPERTYPUT, dp, NULL, &ei, &err); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, NULL, &ei, &err); } return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d1f35be..cbb90ce 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -148,7 +148,7 @@ HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; +HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*) DECLSPEC_HIDDEN; void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN; HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Added support for DISPATCH_PROPERTYPUTREF flag.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 128f79ee775d7e0cd6bddcc4cc94150a5c141768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=128f79ee775d7e0cd6bddcc4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:40:24 2015 +0100 vbscript: Added support for DISPATCH_PROPERTYPUTREF flag. --- dlls/vbscript/vbdisp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 99f975a..c9d318e 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -112,7 +112,9 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA hres = VariantCopyInd(res, v); break; - case DISPATCH_PROPERTYPUT: { + case DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: + case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { VARIANT *put_val; put_val = get_propput_arg(dp); @@ -409,7 +411,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } return exec_script(This->desc->ctx, func, This, pdp, pvarRes); - case DISPATCH_PROPERTYPUT: { + case DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: + case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { VARIANT *put_val; DISPPARAMS dp = {NULL, NULL, 1, 0};

1 0

Mark Harmstone : comctl32: Paint themed scrollbars.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: d7c206972175f8b2eee90358e8c3f12c9973285b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c206972175f8b2eee90358e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 07:44:42 2015 +0000 comctl32: Paint themed scrollbars. --- dlls/comctl32/theme_scrollbar.c | 231 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index ed2c051..9be8384 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -32,8 +32,232 @@ #include "comctl32.h" #include "wine/debug.h" +/* Minimum size of the thumb in pixels */ +#define SCROLL_MIN_THUMB 6 + +/* Minimum size of the rectangle between the arrows */ +#define SCROLL_MIN_RECT 4 + WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); +static void calc_thumb_dimensions(unsigned int size, SCROLLINFO *si, unsigned int *thumbpos, unsigned int *thumbsize) +{ + if (size <= SCROLL_MIN_RECT) + *thumbpos = *thumbsize = 0; + else if (si->nPage > si->nMax - si->nMin) + *thumbpos = *thumbsize = 0; + else { + if (si->nPage > 0) { + *thumbsize = MulDiv(size, si->nPage, si->nMax - si->nMin + 1); + if (*thumbsize < SCROLL_MIN_THUMB) *thumbsize = SCROLL_MIN_THUMB; + } + else *thumbsize = GetSystemMetrics(SM_CXVSCROLL); + + if (size < *thumbsize) + *thumbpos = *thumbsize = 0; + else { + int max = si->nMax - max(si->nPage - 1, 0); + size -= *thumbsize; + if (si->nMin >= max) + *thumbpos = 0; + else + *thumbpos = MulDiv(size, si->nTrackPos - si->nMin, max - si->nMin); + } + } +} + +static void paint_scrollbar(HWND hwnd, HTHEME theme) +{ + HDC dc; + PAINTSTRUCT ps; + RECT r; + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + BOOL vertical = style & SBS_VERT; + BOOL disabled = !IsWindowEnabled(hwnd); + + GetWindowRect(hwnd, &r); + OffsetRect(&r, -r.left, -r.top); + + dc = BeginPaint(hwnd, &ps); + + if (style & SBS_SIZEBOX || style & SBS_SIZEGRIP) { + int state; + + if (style & SBS_SIZEBOXTOPLEFTALIGN) + state = SZB_TOPLEFTALIGN; + else + state = SZB_RIGHTALIGN; + + DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, &r, NULL); + } else { + SCROLLBARINFO sbi; + SCROLLINFO si; + unsigned int thumbpos, thumbsize; + int uppertrackstate, lowertrackstate, thumbstate; + RECT partrect, trackrect; + SIZE grippersize; + + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(hwnd, OBJID_CLIENT, &sbi); + + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + GetScrollInfo(hwnd, SB_CTL, &si); + + trackrect = r; + + if (disabled) { + uppertrackstate = SCRBS_DISABLED; + lowertrackstate = SCRBS_DISABLED; + thumbstate = SCRBS_DISABLED; + } else { + uppertrackstate = SCRBS_NORMAL; + lowertrackstate = SCRBS_NORMAL; + thumbstate = SCRBS_NORMAL; + } + + if (vertical) { + SIZE upsize, downsize; + int uparrowstate, downarrowstate; + + if (disabled) { + uparrowstate = ABS_UPDISABLED; + downarrowstate = ABS_DOWNDISABLED; + } else { + uparrowstate = ABS_UPNORMAL; + downarrowstate = ABS_DOWNNORMAL; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, uparrowstate, NULL, TS_DRAW, &upsize))) { + WARN("Could not get up arrow size.\n"); + return; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, downarrowstate, NULL, TS_DRAW, &downsize))) { + WARN("Could not get down arrow size.\n"); + return; + } + + if (r.bottom - r.top - upsize.cy - downsize.cy < SCROLL_MIN_RECT) + upsize.cy = downsize.cy = (r.bottom - r.top - SCROLL_MIN_RECT)/2; + + partrect = r; + partrect.bottom = partrect.top + upsize.cy; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, uparrowstate, &partrect, NULL); + + trackrect.top = partrect.bottom; + + partrect.bottom = r.bottom; + partrect.top = partrect.bottom - downsize.cy; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, downarrowstate, &partrect, NULL); + + trackrect.bottom = partrect.top; + + calc_thumb_dimensions(trackrect.bottom - trackrect.top, &si, &thumbpos, &thumbsize); + + if (thumbpos > 0) { + partrect.top = trackrect.top; + partrect.bottom = partrect.top + thumbpos; + + DrawThemeBackground(theme, dc, SBP_UPPERTRACKVERT, uppertrackstate, &partrect, NULL); + } + + if (thumbsize > 0) { + partrect.top = trackrect.top + thumbpos; + partrect.bottom = partrect.top + thumbsize; + + DrawThemeBackground(theme, dc, SBP_THUMBBTNVERT, thumbstate, &partrect, NULL); + + if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERVERT, thumbstate, NULL, TS_DRAW, &grippersize))) { + MARGINS margins; + + if (SUCCEEDED(GetThemeMargins(theme, dc, SBP_THUMBBTNVERT, thumbstate, TMT_CONTENTMARGINS, &partrect, &margins))) { + if (grippersize.cy <= (thumbsize - margins.cyTopHeight - margins.cyBottomHeight)) + DrawThemeBackground(theme, dc, SBP_GRIPPERVERT, thumbstate, &partrect, NULL); + } + } + } + + if (thumbpos + thumbsize < trackrect.bottom - trackrect.top) { + partrect.bottom = trackrect.bottom; + partrect.top = trackrect.top + thumbsize + thumbpos; + + DrawThemeBackground(theme, dc, SBP_LOWERTRACKVERT, lowertrackstate, &partrect, NULL); + } + } else { + SIZE leftsize, rightsize; + int leftarrowstate, rightarrowstate; + + if (disabled) { + leftarrowstate = ABS_LEFTDISABLED; + rightarrowstate = ABS_RIGHTDISABLED; + } else { + leftarrowstate = ABS_LEFTNORMAL; + rightarrowstate = ABS_RIGHTNORMAL; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, leftarrowstate, NULL, TS_DRAW, &leftsize))) { + WARN("Could not get left arrow size.\n"); + return; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, rightarrowstate, NULL, TS_DRAW, &rightsize))) { + WARN("Could not get right arrow size.\n"); + return; + } + + if (r.right - r.left - leftsize.cx - rightsize.cx < SCROLL_MIN_RECT) + leftsize.cx = rightsize.cx = (r.right - r.left - SCROLL_MIN_RECT)/2; + + partrect = r; + partrect.right = partrect.left + leftsize.cx; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, leftarrowstate, &partrect, NULL); + + trackrect.left = partrect.right; + + partrect.right = r.right; + partrect.left = partrect.right - rightsize.cx; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, rightarrowstate, &partrect, NULL); + + trackrect.right = partrect.left; + + calc_thumb_dimensions(trackrect.right - trackrect.left, &si, &thumbpos, &thumbsize); + + if (thumbpos > 0) { + partrect.left = trackrect.left; + partrect.right = partrect.left + thumbpos; + + DrawThemeBackground(theme, dc, SBP_UPPERTRACKHORZ, uppertrackstate, &partrect, NULL); + } + + if (thumbsize > 0) { + partrect.left = trackrect.left + thumbpos; + partrect.right = partrect.left + thumbsize; + + DrawThemeBackground(theme, dc, SBP_THUMBBTNHORZ, thumbstate, &partrect, NULL); + + if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERHORZ, thumbstate, NULL, TS_DRAW, &grippersize))) { + MARGINS margins; + + if (SUCCEEDED(GetThemeMargins(theme, dc, SBP_THUMBBTNHORZ, thumbstate, TMT_CONTENTMARGINS, &partrect, &margins))) { + if (grippersize.cx <= (thumbsize - margins.cxLeftWidth - margins.cxRightWidth)) + DrawThemeBackground(theme, dc, SBP_GRIPPERHORZ, thumbstate, &partrect, NULL); + } + } + } + + if (thumbpos + thumbsize < trackrect.right - trackrect.left) { + partrect.right = trackrect.right; + partrect.left = trackrect.left + thumbsize + thumbpos; + + DrawThemeBackground(theme, dc, SBP_LOWERTRACKHORZ, lowertrackstate, &partrect, NULL); + } + } + } + + EndPaint(hwnd, &ps); +} + LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, ULONG_PTR dwRefData) @@ -68,6 +292,13 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, * which will do the repaint. */ break; + case WM_PAINT: + theme = GetWindowTheme(hwnd); + if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + paint_scrollbar(hwnd, theme); + break; + default: return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); }

1 0

Mark Harmstone : dsound/tests: Add GetObjectInPath tests.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: b472e5574c59794ea6e15389cbba2b9e33357f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b472e5574c59794ea6e15389c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 07:46:15 2015 +0000 dsound/tests: Add GetObjectInPath tests. --- dlls/dsound/tests/dsound8.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 5106cf0..b093312 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -38,6 +38,8 @@ #include "ksmedia.h" #include "initguid.h" + +#include "mediaobj.h" #include "wingdi.h" #include "mmdeviceapi.h" #include "audioclient.h" @@ -1256,6 +1258,8 @@ static void test_effects(void) if (rc==DS_OK && secondary8) { LPVOID ptr1,ptr2; DWORD bytes1,bytes2; + IUnknown* obj = NULL; + HRESULT rc2; /* Call SetFX with dwEffectsCount > 0 and pDSFXDesc == NULL */ rc=IDirectSoundBuffer8_SetFX(secondary8,1,NULL,NULL); @@ -1307,14 +1311,46 @@ static void test_effects(void) } /* Call SetFX with standard echo */ - rc=IDirectSoundBuffer8_SetFX(secondary8,1,&effects[0],resultcodes); - ok(rc==DS_OK||rc==REGDB_E_CLASSNOTREG||rc==DSERR_CONTROLUNAVAIL, + rc2=IDirectSoundBuffer8_SetFX(secondary8,1,&effects[0],resultcodes); + ok(rc2==DS_OK||rc2==REGDB_E_CLASSNOTREG||rc2==DSERR_CONTROLUNAVAIL, "IDirectSoundBuffer8_SetFX(GUID_DSFX_STANDARD_ECHO) failed: %08x\n",rc); - if (rc!=DSERR_CONTROLUNAVAIL) { + if (rc2!=DSERR_CONTROLUNAVAIL) { ok(resultcodes[0]==DSFXR_UNKNOWN||resultcodes[0]==DSFXR_LOCHARDWARE||resultcodes[0]==DSFXR_LOCSOFTWARE, "resultcode == %08x, expected DSFXR_UNKNOWN, DSFXR_LOCHARDWARE, or DSFXR_LOCSOFTWARE\n",resultcodes[0]); } + /* Call GetObjectInPath for out-of-bounds DMO */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,2,&IID_IMediaObject,(void**)&obj); + ok(rc==DSERR_OBJECTNOTFOUND||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DSERR_OBJECTNOTFOUND, returned: %08x\n",rc); + + /* Call GetObjectInPath with NULL ppObject */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,0,&IID_IMediaObject,NULL); + ok(rc==E_INVALIDARG||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned E_INVALIDARG, returned: %08x\n",rc); + + /* Call GetObjectInPath for unsupported interface */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,0,&GUID_NULL,(void**)&obj); + ok(rc==E_NOINTERFACE||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned E_NOINTERFACE, returned: %08x\n",rc); + + /* Call GetObjectInPath for unloaded DMO */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_NULL,0,&IID_IMediaObject,(void**)&obj); + ok(rc==DSERR_OBJECTNOTFOUND||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DSERR_OBJECTNOTFOUND, returned: %08x\n",rc); + + /* Call GetObjectInPath for first DMO */ + obj=NULL; + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,0,&IID_IMediaObject,(void**)&obj); + if (rc2==DS_OK) { + ok(rc==DS_OK||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DS_OK, returned: %08x\n",rc); + if (obj) IUnknown_Release(obj); + } else { + ok(rc==DSERR_OBJECTNOTFOUND||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DSERR_OBJECTNOTFOUND, returned: %08x\n",rc); + } + /* Call SetFX with one real filter and one fake one */ rc=IDirectSoundBuffer8_SetFX(secondary8,2,effects,resultcodes); ok(rc==REGDB_E_CLASSNOTREG||rc==DSERR_CONTROLUNAVAIL,

1 0

Nikolay Sivov : rpcrt4: Fix argument check in MesEncodeFixedBufferHandleCreate().
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 37dd44158721d3dc2883418c3cef50ba46f1ae4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37dd44158721d3dc2883418c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 15:18:58 2015 +0300 rpcrt4: Fix argument check in MesEncodeFixedBufferHandleCreate(). --- dlls/rpcrt4/ndr_es.c | 12 ++++++++++++ dlls/rpcrt4/tests/ndr_marshall.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index fa3fe7b..73bd867 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -42,6 +42,7 @@ static inline void init_MIDL_ES_MESSAGE(MIDL_ES_MESSAGE *pEsMsg) /* even if we are unmarshalling, as we don't want pointers to be pointed * to buffer memory */ pEsMsg->StubMsg.IsClient = TRUE; + pEsMsg->MesVersion = 1; } /*********************************************************************** @@ -142,6 +143,17 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( TRACE("(%p, %d, %p, %p)\n", Buffer, BufferSize, pEncodedSize, pHandle); + if (!Buffer) + return RPC_S_INVALID_ARG; + + if (((ULONG_PTR)Buffer % 8) != 0) + return RPC_X_INVALID_BUFFER; + + if (!pEncodedSize) + return RPC_S_INVALID_ARG; + + /* FIXME: check BufferSize too */ + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); if (!pEsMsg) return RPC_S_OUT_OF_MEMORY; diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 1d8a64d..fd1cbbb 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -34,7 +34,7 @@ #include "rpc.h" #include "rpcdce.h" #include "rpcproxy.h" - +#include "midles.h" static int my_alloc_called; static int my_free_called; @@ -2405,6 +2405,42 @@ static void test_NdrGetUserMarshalInfo(void) "NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status); } +static void test_MesEncodeFixedBufferHandleCreate(void) +{ + ULONG encoded_size; + RPC_STATUS status; + handle_t handle; + char *buffer; + + status = MesEncodeFixedBufferHandleCreate(NULL, 0, NULL, NULL); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate(NULL, 0, NULL, &handle); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate((char*)0xdeadbeef, 0, NULL, &handle); + ok(status == RPC_X_INVALID_BUFFER, "got %d\n", status); + + buffer = (void*)((0xdeadbeef + 7) & ~7); + status = MesEncodeFixedBufferHandleCreate(buffer, 0, NULL, &handle); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate(buffer, 0, &encoded_size, &handle); +todo_wine + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); +if (status == RPC_S_OK) + MesHandleFree(handle); + + status = MesEncodeFixedBufferHandleCreate(buffer, 32, NULL, &handle); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate(buffer, 32, &encoded_size, &handle); + ok(status == RPC_S_OK, "got %d\n", status); + + status = MesHandleFree(handle); + ok(status == RPC_S_OK, "got %d\n", status); +} + START_TEST( ndr_marshall ) { determine_pointer_marshalling_style(); @@ -2425,4 +2461,5 @@ START_TEST( ndr_marshall ) test_ndr_buffer(); test_NdrMapCommAndFaultStatus(); test_NdrGetUserMarshalInfo(); + test_MesEncodeFixedBufferHandleCreate(); }

1 0

Nikolay Sivov : rpcrt4: Use RPC_* error code names.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 0810db96faf76b04198efcdf14699096f0731b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0810db96faf76b04198efcdf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 10:41:57 2015 +0300 rpcrt4: Use RPC_* error code names. --- dlls/rpcrt4/ndr_contexthandle.c | 26 +++++++++++++------------- dlls/rpcrt4/ndr_es.c | 12 ++++++------ dlls/rpcrt4/ndr_marshall.c | 6 +++--- dlls/rpcrt4/ndr_stubless.c | 2 +- dlls/rpcrt4/rpc_assoc.c | 4 ++-- dlls/rpcrt4/rpc_binding.c | 18 +++++++++--------- 6 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0810db96faf76b04198ef…

1 0

Damjan Jovanovic : winex11.drv: Support XDnD version 5.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 1a20050826807d51109c684b8272561bcf909318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a20050826807d51109c684b8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Mar 2 06:32:08 2015 +0200 winex11.drv: Support XDnD version 5. --- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xdnd.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0adf7f3..533af2c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -61,7 +61,7 @@ typedef int Status; #define MAX_DASHLEN 16 -#define WINE_XDND_VERSION 4 +#define WINE_XDND_VERSION 5 /* X physical pen */ typedef struct diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 6618edd..f6ce5e9 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -373,6 +373,8 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { XClientMessageEvent e; IDropTarget *dropTarget; + DWORD effect = XDNDDropEffect; + int accept = 0; /* Assume we're not accepting */ TRACE("\n"); @@ -386,7 +388,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { HRESULT hr; POINTL pointl; - DWORD effect = XDNDDropEffect; pointl.x = XDNDxy.x; pointl.y = XDNDxy.y; @@ -395,7 +396,10 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) if (SUCCEEDED(hr)) { if (effect != DROPEFFECT_NONE) + { TRACE("drop succeeded\n"); + accept = 1; + } else TRACE("the application refused the drop\n"); } @@ -414,6 +418,11 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) e.message_type = x11drv_atom(XdndFinished); e.format = 32; e.data.l[0] = event->window; + e.data.l[1] = accept; + if (accept) + e.data.l[2] = X11DRV_XDND_DROPEFFECTToXdndAction(effect); + else + e.data.l[2] = None; XSendEvent(event->display, event->data.l[0], False, NoEventMask, (XEvent*)&e); }

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015