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

Alexandre Julliard : winex11: ExtFloodFill does take the current ROP into account.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: a9b786728cce6e9f68df9c148b0b467316fe4895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9b786728cce6e9f68df9c148… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 17 16:40:47 2012 +0200 winex11: ExtFloodFill does take the current ROP into account. --- dlls/winex11.drv/graphics.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 350a936..9959a29 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1377,9 +1377,7 @@ BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillTy { unsigned long pixel = X11DRV_PALETTE_ToPhysical( physDev, color ); - /* ROP mode is always GXcopy for flood-fill */ wine_tsx11_lock(); - XSetFunction( gdi_display, physDev->gc, GXcopy ); X11DRV_InternalFloodFill(image, physDev, pt.x - rect.left, pt.y - rect.top,

1 0

Alexandre Julliard : gdi32/tests: Fix a test that can fail on multi-monitor setups.
by Alexandre Julliard 17 Apr '12

17 Apr '12

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

Jacek Caban : jscript: Addded parameterized property assignment support.
by Alexandre Julliard 17 Apr '12

17 Apr '12

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 : jscript: Added parameterized property assignment tests.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: d2fb2af8ee882e2b4143d85f9666573359a77d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fb2af8ee882e2b4143d85f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 16:26:16 2012 +0200 jscript: Added parameterized property assignment tests. --- dlls/jscript/tests/run.c | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index e6f0009..c4dfd1d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -64,6 +64,8 @@ DEFINE_EXPECT(global_propdelete_d); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); +DEFINE_EXPECT(global_propargput_d); +DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(puredisp_prop_d); DEFINE_EXPECT(puredisp_noprop_d); DEFINE_EXPECT(testobj_delete); @@ -96,6 +98,7 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_PUREDISP 0x1010 #define DISPID_GLOBAL_TESTPROPDELETE 0x1010 #define DISPID_GLOBAL_ISNULLBSTR 0x1011 +#define DISPID_GLOBAL_PROPARGPUT 0x1012 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -502,7 +505,21 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } - if(strict_dispid_check) + if(!strcmp_wa(bstrName, "propArgPutG")) { + CHECK_EXPECT(global_propargput_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_PROPARGPUT; + return S_OK; + } + + if(!strcmp_wa(bstrName, "propArgPutO")) { + CHECK_EXPECT(global_propargput_d); + test_grfdex(grfdex, fdexNameEnsure|fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_PROPARGPUT; + return S_OK; + } + + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; } @@ -819,6 +836,28 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; + case DISPID_GLOBAL_PROPARGPUT: + CHECK_EXPECT(global_propargput_i); + ok(wFlags == INVOKE_PROPERTYPUT, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg != NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I4, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I4(pdp->rgvarg) == 2, "V_I4(psp->rgvargs) = %d\n", V_I4(pdp->rgvarg)); + + ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I4(pdp->rgvarg+1) == 1, "V_I4(psp->rgvargs+1) = %d\n", V_I4(pdp->rgvarg+1)); + + ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+2)); + ok(V_I4(pdp->rgvarg+2) == 0, "V_I4(psp->rgvargs+2) = %d\n", V_I4(pdp->rgvarg+2)); + return S_OK; + case DISPID_GLOBAL_OBJECT_FLAG: { IDispatchEx *dispex; BSTR str; @@ -1608,6 +1647,18 @@ static BOOL run_tests(void) CHECK_CALLED(testobj_onlydispid_d); CHECK_CALLED(testobj_onlydispid_i); + SET_EXPECT(global_propargput_d); + SET_EXPECT(global_propargput_i); + parse_script_a("var t=0; propArgPutG(t++, t++) = t++;"); + CHECK_CALLED(global_propargput_d); + CHECK_CALLED(global_propargput_i); + + SET_EXPECT(global_propargput_d); + SET_EXPECT(global_propargput_i); + parse_script_a("var t=0; test.propArgPutO(t++, t++) = t++;"); + CHECK_CALLED(global_propargput_d); + CHECK_CALLED(global_propargput_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrameX_AddChild.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 470468c72e345046e8304e607721a9a14cf47c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470468c72e345046e8304e607… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Apr 13 13:55:15 2012 +0200 d3drm: Implement IDirect3DRMFrameX_AddChild. --- dlls/d3drm/frame.c | 71 ++++++++++++++++++++++++++++++++++++++++++--- dlls/d3drm/tests/d3drm.c | 18 ++++++------ 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 5d5427f..985fe58 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include "wine/debug.h" #define COBJMACROS @@ -33,6 +34,9 @@ typedef struct { IDirect3DRMFrame2 IDirect3DRMFrame2_iface; IDirect3DRMFrame3 IDirect3DRMFrame3_iface; LONG ref; + ULONG nb_children; + ULONG children_capacity; + IDirect3DRMFrame3** children; } IDirect3DRMFrameImpl; static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) @@ -45,6 +49,8 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame return CONTAINING_RECORD(iface, IDirect3DRMFrameImpl, IDirect3DRMFrame3_iface); } +static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface); + /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMFrame2Impl_QueryInterface(IDirect3DRMFrame2* iface, REFIID riid, void** object) @@ -89,11 +95,17 @@ static ULONG WINAPI IDirect3DRMFrame2Impl_Release(IDirect3DRMFrame2* iface) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; TRACE("(%p)->(): new ref = %d\n", This, ref); if (!ref) + { + for (i = 0; i < This->nb_children; i++) + IDirect3DRMFrame3_Release(This->children[i]); + HeapFree(GetProcessHeap(), 0, This->children); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -185,10 +197,16 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddChild(IDirect3DRMFrame2* iface, LPDIRECT3DRMFRAME child) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMFrameImpl *frame; - FIXME("(%p/%p)->(%p): stub\n", iface, This, child); + TRACE("(%p/%p)->(%p)\n", iface, This, child); - return E_NOTIMPL; + frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child); + + if (!frame) + return D3DRMERR_BADOBJECT; + + return IDirect3DRMFrame3_AddChild(&This->IDirect3DRMFrame3_iface, &frame->IDirect3DRMFrame3_iface); } static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2* iface, @@ -928,7 +946,6 @@ static const struct IDirect3DRMFrame2Vtbl Direct3DRMFrame2_Vtbl = IDirect3DRMFrame2Impl_GetHierarchyBox }; - /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMFrame3Impl_QueryInterface(IDirect3DRMFrame3* iface, REFIID riid, void** object) @@ -1036,10 +1053,45 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddChild(IDirect3DRMFrame3* iface, LPDIRECT3DRMFRAME3 child) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); + ULONG i; + IDirect3DRMFrame3** children; - FIXME("(%p/%p)->(%p): stub\n", iface, This, child); + TRACE("(%p/%p)->(%p)\n", iface, This, child); - return E_NOTIMPL; + if (!child) + return D3DRMERR_BADOBJECT; + + /* Check if already existing and return gracefully without increasing ref count */ + for (i = 0; i < This->nb_children; i++) + if (This->children[i] == child) + return D3DRM_OK; + + if ((This->nb_children + 1) > This->children_capacity) + { + ULONG new_capacity; + + if (!This->children_capacity) + { + new_capacity = 16; + children = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMFrame3*)); + } + else + { + new_capacity = This->children_capacity * 2; + children = HeapReAlloc(GetProcessHeap(), 0, This->children, new_capacity * sizeof(IDirect3DRMFrame3*)); + } + + if (!children) + return E_OUTOFMEMORY; + + This->children_capacity = new_capacity; + This->children = children; + } + + This->children[This->nb_children++] = child; + IDirect3DRMFrame3_AddRef(child); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_AddLight(IDirect3DRMFrame3* iface, @@ -1927,6 +1979,15 @@ static const struct IDirect3DRMFrame3Vtbl Direct3DRMFrame3_Vtbl = IDirect3DRMFrame3Impl_GetMaterialOverride }; +static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &Direct3DRMFrame2_Vtbl); + + return impl_from_IDirect3DRMFrame2(iface); +} + HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj) { IDirect3DRMFrameImpl* object; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0a05dcd..caa9dc5 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -446,7 +446,7 @@ static void test_Frame(void) /* [Add/Delete]Child with NULL pointer */ hr = IDirect3DRMFrame_AddChild(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); hr = IDirect3DRMFrame_DeleteChild(pFrameP1, NULL); @@ -460,9 +460,9 @@ static void test_Frame(void) todo_wine ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC); - todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameP1, 1); - todo_wine CHECK_REFCOUNT(pFrameC, 2); + CHECK_REFCOUNT(pFrameC, 2); pArray = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP1, &pArray); @@ -489,7 +489,7 @@ static void test_Frame(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); - todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); todo_wine CHECK_REFCOUNT(pFrameC, 2); pArray = NULL; @@ -528,7 +528,7 @@ static void test_Frame(void) /* Add child again */ hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); - todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); todo_wine CHECK_REFCOUNT(pFrameC, 2); pArray = NULL; @@ -548,7 +548,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); - CHECK_REFCOUNT(pFrameC, 1); + todo_wine CHECK_REFCOUNT(pFrameC, 1); pArray = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); @@ -570,11 +570,11 @@ static void test_Frame(void) /* Add two children */ hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); - todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); todo_wine CHECK_REFCOUNT(pFrameC, 2); hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1); - todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); todo_wine CHECK_REFCOUNT(pFrameP1, 3); pArray = NULL; @@ -596,7 +596,7 @@ static void test_Frame(void) } IDirect3DRMMeshBuilder_Release(pFrameP2); - todo_wine CHECK_REFCOUNT(pFrameC, 2); + CHECK_REFCOUNT(pFrameC, 2); todo_wine CHECK_REFCOUNT(pFrameP1, 3); IDirect3DRMMeshBuilder_Release(pFrameC);

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrameX_DeleteChild.
by Alexandre Julliard 17 Apr '12

17 Apr '12

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

André Hentschel : advapi32: Avoid shadowing a parameter.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: e4cb946c4aef0375a1f94a9167db0fe95dbbb014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4cb946c4aef0375a1f94a916… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 13:21:54 2012 +0200 advapi32: Avoid shadowing a parameter. --- dlls/advapi32/registry.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index c4fef67..fc03c1c 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1113,11 +1113,11 @@ LSTATUS WINAPI RegDeleteKeyExA( HKEY hkey, LPCSTR name, REGSAM access, DWORD res { if (!is_version_nt()) /* win95 does recursive key deletes */ { - CHAR name[MAX_PATH]; + CHAR sub[MAX_PATH]; - while(!RegEnumKeyA(tmp, 0, name, sizeof(name))) + while(!RegEnumKeyA(tmp, 0, sub, sizeof(sub))) { - if(RegDeleteKeyExA(tmp, name, access, reserved)) /* recurse */ + if(RegDeleteKeyExA(tmp, sub, access, reserved)) /* recurse */ break; } }

1 0

André Hentschel : crypt32: Avoid shadowing a parameter .
by Alexandre Julliard 17 Apr '12

17 Apr '12

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

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_SetPixelFormat.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 68d9ea4d833d1939bdf7b351845b2d0b9a713eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d9ea4d833d1939bdf7b3518… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 15:50:30 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_SetPixelFormat. --- dlls/windowscodecs/jpegformat.c | 45 +++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 0149043..57008fd 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -701,6 +701,21 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } +typedef struct jpeg_compress_format { + const WICPixelFormatGUID *guid; + int bpp; + int num_components; + J_COLOR_SPACE color_space; + int swap_rgb; +} jpeg_compress_format; + +static const jpeg_compress_format compress_formats[] = { + { &GUID_WICPixelFormat24bppBGR, 24, 3, JCS_RGB, 1 }, + { &GUID_WICPixelFormat32bppCMYK, 32, 4, JCS_CMYK }, + { &GUID_WICPixelFormat8bppGray, 8, 1, JCS_GRAYSCALE }, + { 0 } +}; + typedef struct JpegEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; @@ -713,6 +728,7 @@ typedef struct JpegEncoder { int frame_initialized; int started_compress; UINT width, height; + const jpeg_compress_format *format; IStream *stream; CRITICAL_SECTION lock; BYTE dest_buffer[1024]; @@ -865,8 +881,32 @@ static HRESULT WINAPI JpegEncoder_Frame_SetResolution(IWICBitmapFrameEncode *ifa static HRESULT WINAPI JpegEncoder_Frame_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pPixelFormat)); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + int i; + TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || This->started_compress) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + for (i=0; compress_formats[i].guid; i++) + { + if (memcmp(compress_formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + break; + } + + if (!compress_formats[i].guid) i = 0; + + This->format = &compress_formats[i]; + memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_SetColorContexts(IWICBitmapFrameEncode *iface, @@ -1173,6 +1213,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_initialized = 0; This->started_compress = 0; This->width = This->height = 0; + This->format = NULL; This->stream = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock");

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_SetResolution.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 29b0c79e24a64c179a9edf4ccb043575eca59009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b0c79e24a64c179a9edf4cc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 15:57:22 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_SetResolution. --- dlls/windowscodecs/jpegformat.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 57008fd..2ae1fc7 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -728,6 +728,7 @@ typedef struct JpegEncoder { int frame_initialized; int started_compress; UINT width, height; + double xres, yres; const jpeg_compress_format *format; IStream *stream; CRITICAL_SECTION lock; @@ -874,8 +875,23 @@ static HRESULT WINAPI JpegEncoder_Frame_SetSize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI JpegEncoder_Frame_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); + + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || This->started_compress) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->xres = dpiX; + This->yres = dpiY; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_SetPixelFormat(IWICBitmapFrameEncode *iface, @@ -1213,6 +1229,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_initialized = 0; This->started_compress = 0; This->width = This->height = 0; + This->xres = This->yres = 0.0; This->format = NULL; This->stream = NULL; InitializeCriticalSection(&This->lock);

1 0