April 2012 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLDocument2::put_URL implementation.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 34b41084a106260e84acad0c120210698dbc022e URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b41084a106260e84acad0c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 12:10:26 2012 +0200 mshtml: Added IHTMLDocument2::put_URL implementation. --- dlls/mshtml/htmldoc.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a5b20bc..98bdcab 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -595,8 +595,15 @@ static HRESULT WINAPI HTMLDocument_get_lastModified(IHTMLDocument2 *iface, BSTR static HRESULT WINAPI HTMLDocument_put_URL(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->window) { + FIXME("No window available\n"); + return E_FAIL; + } + + return navigate_url(This->window, v, This->window->url); } static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p)

1 0

Dmitry Timoshkov : server: Add access mapping for IO completion objects.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 16b7a7f707fd5f38cf5b290d02daed2676120180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b7a7f707fd5f38cf5b290d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 17 17:02:19 2012 +0900 server: Add access mapping for IO completion objects. --- server/completion.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/server/completion.c b/server/completion.c index 2a8f9ac..948d7d1 100644 --- a/server/completion.c +++ b/server/completion.c @@ -53,8 +53,9 @@ struct completion static void completion_dump( struct object*, int ); static struct object_type *completion_get_type( struct object *obj ); +static int completion_signaled( struct object *obj, struct thread *thread ); +static unsigned int completion_map_access( struct object *obj, unsigned int access ); static void completion_destroy( struct object * ); -static int completion_signaled( struct object *obj, struct thread *thread ); static const struct object_ops completion_ops = { @@ -67,7 +68,7 @@ static const struct object_ops completion_ops = no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + completion_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ @@ -120,6 +121,15 @@ static int completion_signaled( struct object *obj, struct thread *thread ) return !list_empty( &completion->queue ); } +static unsigned int completion_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE | IO_COMPLETION_QUERY_STATE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | IO_COMPLETION_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static struct completion *create_completion( struct directory *root, const struct unicode_str *name, unsigned int attr, unsigned int concurrent ) { struct completion *completion;

1 0

Dmitry Timoshkov : kernel32: Fix some typos, remove not needed casts.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: d4e57b1598d13fb23843594aefd21eca899ac951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e57b1598d13fb23843594ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 17 16:59:53 2012 +0900 kernel32: Fix some typos, remove not needed casts. --- dlls/kernel32/tests/virtual.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4ca47e0..b537ce0 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -667,7 +667,7 @@ static void test_MapViewOfFile(void) ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); ok(info.BaseAddress == ptr, "BaseAddress should have been %p but was %p instead\n", ptr, info.BaseAddress); ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); - ok(info.RegionSize == MAPPING_SIZE, "RegionSize should have been 0x%x but was 0x%x\n", MAPPING_SIZE, (unsigned int)info.RegionSize); + ok(info.RegionSize == MAPPING_SIZE, "RegionSize should have been 0x%x but was 0x%lx\n", MAPPING_SIZE, info.RegionSize); ok(info.State == MEM_RESERVE, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); if (info.Type == MEM_PRIVATE) /* win9x is different for uncommitted mappings */ { @@ -695,7 +695,7 @@ static void test_MapViewOfFile(void) ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); ok(info.RegionSize == MAPPING_SIZE, - "RegionSize should have been 0x%x but was 0x%x\n", MAPPING_SIZE, (unsigned int)info.RegionSize); + "RegionSize should have been 0x%x but was 0x%lx\n", MAPPING_SIZE, info.RegionSize); ok(info.State == MEM_RESERVE, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); ok(info.Protect == 0, @@ -711,7 +711,7 @@ static void test_MapViewOfFile(void) ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); ok(info.BaseAddress == ptr, "BaseAddress should have been %p but was %p instead\n", ptr, info.BaseAddress); ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); - ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%x\n", (unsigned int)info.RegionSize); + ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%lx\n", info.RegionSize); ok(info.State == MEM_COMMIT, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); ok(info.Protect == PAGE_READONLY, "Protect should have been 0 instead of 0x%x\n", info.Protect); if (info.Type == MEM_PRIVATE) /* win9x is different for uncommitted mappings */ @@ -740,11 +740,11 @@ static void test_MapViewOfFile(void) ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); ok(info.RegionSize == 0x10000, - "RegionSize should have been 0x10000 but was 0x%x\n", (unsigned int)info.RegionSize); + "RegionSize should have been 0x10000 but was 0x%lx\n", info.RegionSize); ok(info.State == MEM_COMMIT, - "State should have been MEM_RESERVE instead of 0x%x\n", info.State); + "State should have been MEM_COMMIT instead of 0x%x\n", info.State); ok(info.Protect == PAGE_READWRITE, - "Protect should have been 0 instead of 0x%x\n", info.Protect); + "Protect should have been PAGE_READWRITE instead of 0x%x\n", info.Protect); ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); }

1 0

Alexandre Julliard : winex11: Convert all points to device coordinates at once for polylines and polygons .
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: dedd9fe23e74a8ada939eeeb238d804e52f10723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dedd9fe23e74a8ada939eeeb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 17 14:38:24 2012 +0200 winex11: Convert all points to device coordinates at once for polylines and polygons. --- dlls/winex11.drv/graphics.c | 179 +++++++++++++++++++++---------------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 90 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dedd9fe23e74a8ada939e…

1 0

Jacek Caban : mshtml: Added IHTMLStyle2::overflowY implementation.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: b2f3144e0c36511e356c4613c5182d363f4efe9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f3144e0c36511e356c4613c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 12:41:40 2012 +0200 mshtml: Added IHTMLStyle2::overflowY implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 9bad1a6..b9f0ddd 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -136,6 +136,8 @@ static const WCHAR attrOverflow[] = {'o','v','e','r','f','l','o','w',0}; static const WCHAR attrOverflowX[] = {'o','v','e','r','f','l','o','w','-','x',0}; +static const WCHAR attrOverflowY[] = + {'o','v','e','r','f','l','o','w','-','y',0}; static const WCHAR attrPadding[] = {'p','a','d','d','i','n','g',0}; static const WCHAR attrPaddingBottom[] = @@ -232,6 +234,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, {attrOverflowX, DISPID_IHTMLSTYLE2_OVERFLOWX}, + {attrOverflowY, DISPID_IHTMLSTYLE2_OVERFLOWY}, {attrPadding, DISPID_IHTMLSTYLE_PADDING}, {attrPaddingBottom, DISPID_IHTMLSTYLE_PADDINGBOTTOM}, {attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 2626eb6..ce42d3e 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -84,6 +84,7 @@ typedef enum { STYLEID_MIN_HEIGHT, STYLEID_OVERFLOW, STYLEID_OVERFLOW_X, + STYLEID_OVERFLOW_Y, STYLEID_PADDING, STYLEID_PADDING_BOTTOM, STYLEID_PADDING_LEFT, diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index 05668f9..7eedc00 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -525,15 +525,19 @@ static HRESULT WINAPI HTMLStyle2_get_overflowX(IHTMLStyle2 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle2_put_overflowY(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_Y, v, 0); } static HRESULT WINAPI HTMLStyle2_get_overflowY(IHTMLStyle2 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_Y, p, 0); } static HRESULT WINAPI HTMLStyle2_put_accelerator(IHTMLStyle2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 280595e..7b6d69d 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -360,6 +360,22 @@ static void test_style2(IHTMLStyle2 *style2) hres = IHTMLStyle2_get_overflowX(style2, &str); ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); + + /* overflowY */ + str = (void*)0xdeadbeef; + hres = IHTMLStyle2_get_overflowY(style2, &str); + ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); + ok(!str, "overflowY = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("hidden"); + hres = IHTMLStyle2_put_overflowY(style2, str); + ok(hres == S_OK, "put_overflowY failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle2_get_overflowY(style2, &str); + ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); + ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); } static void test_style3(IHTMLStyle3 *style3)

1 0

Jacek Caban : jscript: Addded parameterized property assignment support.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 0b0e34ab390af7cec0123cbc452425e83a419d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0e34ab390af7cec0123cbc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 16:25:58 2012 +0200 jscript: Addded parameterized property assignment support. --- dlls/jscript/compile.c | 43 ++++++++++++++++++++++++++++++++++++++----- dlls/jscript/dispex.c | 5 +++++ dlls/jscript/engine.c | 29 +++++++++++++++++++++++++++++ dlls/jscript/engine.h | 1 + 4 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index b14c50b..16eed9e 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -607,9 +607,43 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_t *expr, jsop_t op) { + BOOL use_throw_path = FALSE; + unsigned arg_cnt = 0; HRESULT hres; - if(!is_memberid_expr(expr->expression1->type)) { + if(expr->expression1->type == EXPR_CALL) { + call_expression_t *call_expr = (call_expression_t*)expr->expression1; + argument_t *arg; + + if(op != OP_LAST) { + FIXME("op %d not supported on parametrized assign expressions\n", op); + return E_NOTIMPL; + } + + if(is_memberid_expr(call_expr->expression->type) && call_expr->argument_list) { + hres = compile_memberid_expression(ctx, call_expr->expression, fdexNameEnsure); + if(FAILED(hres)) + return hres; + + for(arg = call_expr->argument_list; arg; arg = arg->next) { + hres = compile_expression(ctx, arg->expr); + if(FAILED(hres)) + return hres; + arg_cnt++; + } + }else { + use_throw_path = TRUE; + } + }else if(is_memberid_expr(expr->expression1->type)) { + hres = compile_memberid_expression(ctx, expr->expression1, fdexNameEnsure); + if(FAILED(hres)) + return hres; + }else { + use_throw_path = TRUE; + } + + if(use_throw_path) { + /* Illegal assignment: evaluate and throw */ hres = compile_expression(ctx, expr->expression1); if(FAILED(hres)) return hres; @@ -624,10 +658,6 @@ static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_ return push_instr_uint(ctx, OP_throw_ref, JS_E_ILLEGAL_ASSIGN); } - hres = compile_memberid_expression(ctx, expr->expression1, fdexNameEnsure); - if(FAILED(hres)) - return hres; - if(op != OP_LAST && !push_instr(ctx, OP_refval)) return E_OUTOFMEMORY; @@ -638,6 +668,9 @@ static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_ if(op != OP_LAST && !push_instr(ctx, op)) return E_OUTOFMEMORY; + if(arg_cnt) + return push_instr_uint(ctx, OP_assign_call, arg_cnt); + if(!push_instr(ctx, OP_assign)) return E_OUTOFMEMORY; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0e209db..8518768 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1030,6 +1030,11 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { + if(flags & DISPATCH_PROPERTYPUT) { + FIXME("disp_call(propput) on builtin object\n"); + return E_FAIL; + } + hres = jsdisp_call(jsdisp, id, flags, dp, retv, ei); jsdisp_release(jsdisp); return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 19fddd4..d1854f8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2382,6 +2382,35 @@ static HRESULT interp_assign(exec_ctx_t *ctx) return stack_push(ctx, v); } +/* JScript extension */ +static HRESULT interp_assign_call(exec_ctx_t *ctx) +{ + const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + DISPID propput_dispid = DISPID_PROPERTYPUT; + IDispatch *disp; + DISPPARAMS dp; + VARIANT *v; + DISPID id; + HRESULT hres; + + TRACE("%u\n", arg); + + disp = stack_topn_objid(ctx, arg+1, &id); + if(!disp) + return throw_reference_error(ctx->script, ctx->ei, JS_E_ILLEGAL_ASSIGN, NULL); + + jsstack_to_dp(ctx, arg+1, &dp); + dp.cNamedArgs = 1; + dp.rgdispidNamedArgs = &propput_dispid; + hres = disp_call(ctx->script, disp, id, DISPATCH_PROPERTYPUT, &dp, NULL, ctx->ei); + if(FAILED(hres)) + return hres; + + v = stack_pop(ctx); + stack_popn(ctx, arg+2); + return stack_push(ctx, v); +} + static HRESULT interp_undefined(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index bb6552e..f214501 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -64,6 +64,7 @@ typedef struct { X(and, 1, 0,0) \ X(array, 1, 0,0) \ X(assign, 1, 0,0) \ + X(assign_call,1, ARG_UINT, 0) \ X(bool, 1, ARG_INT, 0) \ X(bneg, 1, 0,0) \ X(call, 1, ARG_UINT, ARG_UINT) \

1 0

Jacek Caban : mshtml: Added IHTMLWindow3::detachEvent implementation.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: c5c94f101f1288cb1c84b61e9ad2742cda2dedf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c94f101f1288cb1c84b61e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 12:11:01 2012 +0200 mshtml: Added IHTMLWindow3::detachEvent implementation. --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3ee2273..a0cf108 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1431,8 +1431,15 @@ static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, I static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp) { HTMLWindow *This = impl_from_IHTMLWindow3(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + if(!This->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return detach_event(This->doc->body_event_target, &This->doc->basedoc, event, pDisp); } static HRESULT window_set_timer(HTMLWindow *This, VARIANT *expr, LONG msec, VARIANT *language,

1 0

André Hentschel : crypt32: Avoid shadowing a parameter .
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 7468238539666cd4eba4e45bb923ff8f602d6297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7468238539666cd4eba4e45bb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 13:21:55 2012 +0200 crypt32: Avoid shadowing a parameter. --- dlls/crypt32/msg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 610f8c5..3e00a89 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2397,16 +2397,16 @@ static BOOL CDecodeMsg_FinalizeSignedContent(CDecodeMsg *msg, !strcmp(msg->u.signed_data.info->content.pszObjId, szOID_RSA_data)) { - CRYPT_DATA_BLOB *blob; + CRYPT_DATA_BLOB *rsa_blob; ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, content->pbData, content->cbData, - CRYPT_DECODE_ALLOC_FLAG, NULL, &blob, &size); + CRYPT_DECODE_ALLOC_FLAG, NULL, &rsa_blob, &size); if (ret) { ret = CSignedMsgData_Update(&msg->u.signed_data, - blob->pbData, blob->cbData, TRUE, Verify); - LocalFree(blob); + rsa_blob->pbData, rsa_blob->cbData, TRUE, Verify); + LocalFree(rsa_blob); } } else

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrameX_DeleteChild.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 4001e60e34ccdf214cb5757a3a8ddccb550a355d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4001e60e34ccdf214cb5757a3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Apr 13 13:55:23 2012 +0200 d3drm: Implement IDirect3DRMFrameX_DeleteChild. --- dlls/d3drm/frame.c | 30 ++++++++++++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 4 ++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 985fe58..55fa08b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -482,10 +482,16 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteChild(IDirect3DRMFrame2* iface LPDIRECT3DRMFRAME frame) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMFrameImpl *child; - FIXME("(%p/%p)->(%p): stub\n", iface, This, frame); + TRACE("(%p/%p)->(%p)\n", iface, This, frame); - return E_NOTIMPL; + child = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)frame); + + if (!child) + return D3DRMERR_BADOBJECT; + + return IDirect3DRMFrame3_DeleteChild(&This->IDirect3DRMFrame3_iface, &child->IDirect3DRMFrame3_iface); } static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteLight(IDirect3DRMFrame2* iface, @@ -1358,10 +1364,26 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteChild(IDirect3DRMFrame3* iface LPDIRECT3DRMFRAME3 frame) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); + ULONG i; - FIXME("(%p/%p)->(%p): stub\n", iface, This, frame); + TRACE("(%p/%p)->(%p)\n", iface, This, frame); - return E_NOTIMPL; + if (!frame) + return D3DRMERR_BADOBJECT; + + /* Check if child exists */ + for (i = 0; i < This->nb_children; i++) + if (This->children[i] == frame) + break; + + if (i == This->nb_children) + return D3DRMERR_BADVALUE; + + memmove(This->children + i, This->children + i + 1, sizeof(IDirect3DRMFrame3*) * (This->nb_children - 1 - i)); + IDirect3DRMFrame3_Release(frame); + This->nb_children--; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteLight(IDirect3DRMFrame3* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index caa9dc5..91e1c76 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -450,7 +450,7 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 1); hr = IDirect3DRMFrame_DeleteChild(pFrameP1, NULL); - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameP1, 1); /* Add child to first parent */ @@ -547,7 +547,7 @@ static void test_Frame(void) /* Delete child */ hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC); - todo_wine ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr); todo_wine CHECK_REFCOUNT(pFrameC, 1); pArray = NULL;

1 0

Alexandre Julliard : gdi32/tests: Fix a test that can fail on multi-monitor setups.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 8b7760292d00e98b4c579d632d8170cb2f89b4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7760292d00e98b4c579d632… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 17 14:56:10 2012 +0200 gdi32/tests: Fix a test that can fail on multi-monitor setups. --- dlls/gdi32/tests/dc.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index c935c36..91e06c4 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -403,11 +403,15 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) } type = GetClipBox( ref_dc, &rect ); - ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr ); - ok( rect.left == 0 && rect.top == 0 && - rect.right == GetDeviceCaps( ref_dc, DESKTOPHORZRES ) && - rect.bottom == GetDeviceCaps( ref_dc, DESKTOPVERTRES ), - "GetClipBox returned %d,%d,%d,%d on %s\n", rect.left, rect.top, rect.right, rect.bottom, descr ); + if (type != COMPLEXREGION) /* region can be complex on multi-monitor setups */ + { + ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr ); + ok( rect.left == 0 && rect.top == 0 && + rect.right == GetDeviceCaps( ref_dc, DESKTOPHORZRES ) && + rect.bottom == GetDeviceCaps( ref_dc, DESKTOPVERTRES ), + "GetClipBox returned %d,%d,%d,%d on %s\n", + rect.left, rect.top, rect.right, rect.bottom, descr ); + } SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_ACCUMULATE ); SetMapMode( ref_dc, MM_TEXT );

1 0