September 2011 - Wine-Commits

Jacek Caban : vbscript: Added support for IObjectWithSite in create_object.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: d339a0b4431e1d2df8192df5e6e985001224aaf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d339a0b4431e1d2df8192df5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:25:50 2011 +0200 vbscript: Added support for IObjectWithSite in create_object. --- dlls/vbscript/global.c | 14 +++++- dlls/vbscript/vbscript.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 2 + 3 files changed, 111 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5af7e16..771236d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -122,10 +122,18 @@ static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); if(SUCCEEDED(hres)) { - FIXME("ObjectWithSite\n"); + IUnknown *ax_site; + + ax_site = create_ax_site(ctx); + if(ax_site) { + hres = IObjectWithSite_SetSite(obj_site, ax_site); + IUnknown_Release(ax_site); + } IObjectWithSite_Release(obj_site); - IUnknown_Release(obj); - return NULL; + if(!ax_site || FAILED(hres)) { + IUnknown_Release(obj); + return NULL; + } } return obj; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index d4e8cca..7bea9f2b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -664,3 +664,101 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU IActiveScript_Release(&ret->IActiveScript_iface); return hres; } + +typedef struct { + IServiceProvider IServiceProvider_iface; + + LONG ref; + + IServiceProvider *sp; +} AXSite; + +static inline AXSite *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, AXSite, IServiceProvider_iface); +} + +static HRESULT WINAPI AXSite_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + AXSite *This = impl_from_IServiceProvider(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IServiceProvider_iface; + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = &This->IServiceProvider_iface; + }else { + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI AXSite_AddRef(IServiceProvider *iface) +{ + AXSite *This = impl_from_IServiceProvider(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI AXSite_Release(IServiceProvider *iface) +{ + AXSite *This = impl_from_IServiceProvider(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI AXSite_QueryService(IServiceProvider *iface, + REFGUID guidService, REFIID riid, void **ppv) +{ + AXSite *This = impl_from_IServiceProvider(iface); + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + return IServiceProvider_QueryService(This->sp, guidService, riid, ppv); +} + +static IServiceProviderVtbl AXSiteVtbl = { + AXSite_QueryInterface, + AXSite_AddRef, + AXSite_Release, + AXSite_QueryService +}; + +IUnknown *create_ax_site(script_ctx_t *ctx) +{ + IServiceProvider *sp; + AXSite *ret; + HRESULT hres; + + hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IServiceProvider, (void**)&sp); + if(FAILED(hres)) { + ERR("Could not get IServiceProvider iface: %08x\n", hres); + return NULL; + } + + ret = heap_alloc(sizeof(*ret)); + if(!ret) { + IServiceProvider_Release(sp); + return NULL; + } + + ret->IServiceProvider_iface.lpVtbl = &AXSiteVtbl; + ret->ref = 1; + ret->sp = sp; + + return (IUnknown*)&ret->IServiceProvider_iface; +} diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d8134fa..491003b 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -171,6 +171,8 @@ struct _script_ctx_t { HRESULT init_global(script_ctx_t*); HRESULT init_err(script_ctx_t*); +IUnknown *create_ax_site(script_ctx_t*) DECLSPEC_HIDDEN; + typedef enum { ARG_NONE = 0, ARG_STR,

1 0

Jacek Caban : vbscript: Added CreateObject implementation.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 0d039cc6ebeffc5c3642660e8a8d7e0c9e76ed84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d039cc6ebeffc5c3642660e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:25:27 2011 +0200 vbscript: Added CreateObject implementation. --- dlls/vbscript/Makefile.in | 2 +- dlls/vbscript/global.c | 134 ++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.c | 3 + dlls/vbscript/vbscript.h | 3 + dlls/vbscript/vbscript_main.c | 1 + 5 files changed, 140 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 2da0c33..e4765a0 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -1,5 +1,5 @@ MODULE = vbscript.dll -IMPORTS = oleaut32 +IMPORTS = oleaut32 ole32 C_SRCS = \ compile.c \ diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 3d58ea7..5af7e16 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -19,10 +19,118 @@ #include "vbscript.h" #include "vbscript_defs.h" +#include "mshtmhst.h" +#include "objsafe.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#define VB_E_CANNOT_CREATE_OBJ 0x800a01ad + +/* Defined as extern in urlmon.idl, but not exported by uuid.lib */ +const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = + {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; + +static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) +{ + IInternetHostSecurityManager *secmgr; + IServiceProvider *sp; + HRESULT hres; + + if(!ctx->site) + return NULL; + + if(ctx->secmgr) + return ctx->secmgr; + + hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IServiceProvider, (void**)&sp); + if(FAILED(hres)) + return NULL; + + hres = IServiceProvider_QueryService(sp, &SID_SInternetHostSecurityManager, &IID_IInternetHostSecurityManager, + (void**)&secmgr); + IServiceProvider_Release(sp); + if(FAILED(hres)) + return NULL; + + return ctx->secmgr = secmgr; +} + +static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) +{ + IInternetHostSecurityManager *secmgr = NULL; + IObjectWithSite *obj_site; + struct CONFIRMSAFETY cs; + IClassFactoryEx *cfex; + IClassFactory *cf; + DWORD policy_size; + BYTE *bpolicy; + IUnknown *obj; + DWORD policy; + GUID guid; + HRESULT hres; + + hres = CLSIDFromProgID(progid, &guid); + if(FAILED(hres)) + return NULL; + + TRACE("GUID %s\n", debugstr_guid(&guid)); + + if(ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) { + secmgr = get_sec_mgr(ctx); + if(!secmgr) + return NULL; + + policy = 0; + hres = IInternetHostSecurityManager_ProcessUrlAction(secmgr, URLACTION_ACTIVEX_RUN, + (BYTE*)&policy, sizeof(policy), (BYTE*)&guid, sizeof(GUID), 0, 0); + if(FAILED(hres) || policy != URLPOLICY_ALLOW) + return NULL; + } + + hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); + if(FAILED(hres)) + return NULL; + + hres = IClassFactory_QueryInterface(cf, &IID_IClassFactoryEx, (void**)&cfex); + if(SUCCEEDED(hres)) { + FIXME("Use IClassFactoryEx\n"); + IClassFactoryEx_Release(cfex); + } + + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); + if(FAILED(hres)) + return NULL; + + if(secmgr) { + cs.clsid = guid; + cs.pUnk = obj; + cs.dwFlags = 0; + hres = IInternetHostSecurityManager_QueryCustomPolicy(secmgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &bpolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + if(SUCCEEDED(hres)) { + policy = policy_size >= sizeof(DWORD) ? *(DWORD*)bpolicy : URLPOLICY_DISALLOW; + CoTaskMemFree(bpolicy); + } + + if(FAILED(hres) || policy != URLPOLICY_ALLOW) { + IUnknown_Release(obj); + return NULL; + } + } + + hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); + if(SUCCEEDED(hres)) { + FIXME("ObjectWithSite\n"); + IObjectWithSite_Release(obj_site); + IUnknown_Release(obj); + return NULL; + } + + return obj; +} + static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -483,8 +591,30 @@ static HRESULT Global_MsgBox(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_CreateObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + IUnknown *obj; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + if(V_VT(arg) != VT_BSTR) { + FIXME("non-bstr arg\n"); + return E_INVALIDARG; + } + + obj = create_object(This->desc->ctx, V_BSTR(arg)); + if(!obj) + return VB_E_CANNOT_CREATE_OBJ; + + if(res) { + hres = IUnknown_QueryInterface(obj, &IID_IDispatch, (void**)&V_DISPATCH(res)); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + } + + IUnknown_Release(obj); + return S_OK; } static HRESULT Global_GetObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 3ac9560..d4e8cca 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -129,6 +129,8 @@ static void destroy_script(script_ctx_t *ctx) if(ctx->host_global) IDispatch_Release(ctx->host_global); + if(ctx->secmgr) + IInternetHostSecurityManager_Release(ctx->secmgr); if(ctx->site) IActiveScriptSite_Release(ctx->site); if(ctx->err_obj) @@ -516,6 +518,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) if(!ctx) return E_OUTOFMEMORY; + ctx->safeopt = This->safeopt; vbsheap_init(&ctx->heap); list_init(&ctx->objects); list_init(&ctx->code_list); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 4b0a569..d8134fa 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -143,6 +143,9 @@ struct _script_ctx_t { IActiveScriptSite *site; LCID lcid; + IInternetHostSecurityManager *secmgr; + DWORD safeopt; + IDispatch *host_global; class_desc_t script_desc; diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 4054d35..c47227f 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -20,6 +20,7 @@ #include "vbscript.h" #include "objsafe.h" +#include "mshtmhst.h" #include "rpcproxy.h" #include "vbscript_classes.h" #include "vbsglobal.h"

1 0

Jacek Caban : vbscript: Added exit for statement support.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: ed53c40eda20dfb00544869cf6ca13cc7698a467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed53c40eda20dfb00544869cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:24:44 2011 +0200 vbscript: Added exit for statement support. --- dlls/vbscript/compile.c | 27 +++++++++++++++++++++++++-- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 9 +++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 1f1f041..153e9b0 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -39,6 +39,7 @@ typedef struct { unsigned labels_cnt; unsigned while_end_label; + unsigned for_end_label; unsigned sub_end_label; unsigned func_end_label; unsigned prop_end_label; @@ -617,7 +618,7 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *stat) { - unsigned step_instr, instr; + unsigned step_instr, instr, prev_label; BSTR identifier; HRESULT hres; @@ -654,10 +655,16 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return hres; } + prev_label = ctx->for_end_label; + ctx->for_end_label = alloc_label(ctx); + if(ctx->for_end_label == -1) + return E_OUTOFMEMORY; + step_instr = push_instr(ctx, OP_step); if(step_instr == -1) return E_OUTOFMEMORY; instr_ptr(ctx, step_instr)->arg2.bstr = identifier; + instr_ptr(ctx, step_instr)->arg1.uint = ctx->for_end_label; hres = compile_statement(ctx, stat->body); if(FAILED(hres)) @@ -672,7 +679,8 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(FAILED(hres)) return hres; - instr_ptr(ctx, step_instr)->arg1.uint = ctx->instr_cnt; + label_set_addr(ctx, ctx->for_end_label); + ctx->for_end_label = prev_label; return push_instr_uint(ctx, OP_pop, 2); } @@ -804,6 +812,16 @@ static HRESULT compile_exitdo_statement(compile_ctx_t *ctx) return push_instr_addr(ctx, OP_jmp, ctx->while_end_label); } +static HRESULT compile_exitfor_statement(compile_ctx_t *ctx) +{ + if(ctx->for_end_label == -1) { + FIXME("Exit For outside For Loop\n"); + return E_FAIL; + } + + return push_instr_addr(ctx, OP_jmp, ctx->for_end_label); +} + static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) { if(ctx->sub_end_label == -1) { @@ -864,6 +882,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_EXITDO: hres = compile_exitdo_statement(ctx); break; + case STAT_EXITFOR: + hres = compile_exitfor_statement(ctx); + break; case STAT_EXITFUNC: hres = compile_exitfunc_statement(ctx); break; @@ -931,6 +952,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; ctx->while_end_label = -1; + ctx->for_end_label = -1; ctx->sub_end_label = -1; ctx->func_end_label = -1; ctx->prop_end_label = -1; @@ -967,6 +989,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f return hres; assert(ctx->while_end_label == -1); + assert(ctx->for_end_label == -1); if(ctx->sub_end_label != -1) label_set_addr(ctx, ctx->sub_end_label); diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index a5bd505..e58e7f3 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -103,6 +103,7 @@ typedef enum { STAT_DOUNTIL, STAT_DOWHILE, STAT_EXITDO, + STAT_EXITFOR, STAT_EXITFUNC, STAT_EXITPROP, STAT_EXITSUB, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3b30051..d6bda55 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -178,6 +178,7 @@ SimpleStatement CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tDO { $$ = new_statement(ctx, STAT_EXITDO, 0); CHECK_ERROR; } + | tEXIT tFOR { $$ = new_statement(ctx, STAT_EXITFOR, 0); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } | tEXIT tPROPERTY { $$ = new_statement(ctx, STAT_EXITPROP, 0); CHECK_ERROR; } | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3b3ad50..46a0330 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -387,6 +387,15 @@ for x = 5 to 8 next Call ok(y = "for8: 5 7", "y = " & y) +for x = 1.5 to 1 + Call ok(false, "for..to called when unexpected") +next + +for x = 1 to 100 + exit for + Call ok(false, "exit for not escaped the loop?") +next + if false then Sub testsub x = true

1 0

Andrew Talbot : crtdll: Supress sign-extension through integer promotion.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 6176fa469a431650b41a1c5598eb7cdcca5067a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6176fa469a431650b41a1c559… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Sep 21 20:44:03 2011 +0100 crtdll: Supress sign-extension through integer promotion. --- dlls/crtdll/crtdll_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c index a09f6f6..ac5677f 100644 --- a/dlls/crtdll/crtdll_main.c +++ b/dlls/crtdll/crtdll_main.c @@ -176,7 +176,7 @@ size_t CDECL _strncnt(const char *str, size_t maxlen) */ unsigned int CDECL _strnextc(const char *str) { - return (unsigned int)str[0]; + return (unsigned char)str[0]; }

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_display_mode() const.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 013991e6e41c00a64dbcf26d09e1bdd3fd586e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=013991e6e41c00a64dbcf26d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:47 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_display_mode() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fad63e4..d1bec23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3920,7 +3920,7 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device return wined3d_get_device_caps(device->wined3d, device->adapter->ordinal, device->devType, caps); } -HRESULT CDECL wined3d_device_get_display_mode(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, WINED3DDISPLAYMODE *mode) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index edc2e40..91efa2d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2216,7 +2216,7 @@ HRESULT __cdecl wined3d_device_get_current_texture_palette(struct wined3d_device HRESULT __cdecl wined3d_device_get_depth_stencil(struct wined3d_device *device, struct wined3d_surface **depth_stencil); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); -HRESULT __cdecl wined3d_device_get_display_mode(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, WINED3DDISPLAYMODE *mode); HRESULT __cdecl wined3d_device_get_front_buffer_data(struct wined3d_device *device, UINT swapchain_idx, struct wined3d_surface *dst_surface);

1 0

Alexandre Julliard : gdi32: Add helper functions for copying a DIB line.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 5fd305c31f98d581c165ed4d314fc79d60d8c835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd305c31f98d581c165ed4d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 10:18:14 2011 +0200 gdi32: Add helper functions for copying a DIB line. --- dlls/gdi32/dibdrv/primitives.c | 96 +++++++++++++++++++++++---------------- 1 files changed, 57 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index c102f9c..de0993b 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -104,6 +104,57 @@ static inline void do_rop_codes_mask_8(BYTE *dst, BYTE src, struct rop_codes *co do_rop_mask_8( dst, (src & codes->a1) ^ codes->a2, (src & codes->x1) ^ codes->x2, mask ); } +static inline void do_rop_codes_line_32(DWORD *dst, const DWORD *src, struct rop_codes *codes, int len) +{ + for (; len > 0; len--, src++, dst++) do_rop_codes_32( dst, *src, codes ); +} + +static inline void do_rop_codes_line_16(WORD *dst, const WORD *src, struct rop_codes *codes, int len) +{ + for (; len > 0; len--, src++, dst++) do_rop_codes_16( dst, *src, codes ); +} + +static inline void do_rop_codes_line_8(BYTE *dst, const BYTE *src, struct rop_codes *codes, int len) +{ + for (; len > 0; len--, src++, dst++) do_rop_codes_8( dst, *src, codes ); +} + +static inline void do_rop_codes_line_4(BYTE *dst, int dst_x, const BYTE *src, int src_x, + struct rop_codes *codes, int len) +{ + BYTE src_val; + + for (src += src_x / 2, dst += dst_x / 2; len > 0; len--, dst_x++, src_x++) + { + if (dst_x & 1) + { + if (src_x & 1) src_val = *src++; + else src_val = *src >> 4; + do_rop_codes_mask_8( dst++, src_val, codes, 0x0f ); + } + else + { + if (src_x & 1) src_val = *src++ << 4; + else src_val = *src; + do_rop_codes_mask_8( dst, src_val, codes, 0xf0 ); + } + } +} + +static inline void do_rop_codes_line_1(BYTE *dst, int dst_x, const BYTE *src, int src_x, + struct rop_codes *codes, int len) +{ + BYTE src_val; + + for (src += src_x / 8, dst += dst_x / 8; len > 0; len--, dst_x++, src_x++) + { + src_val = *src & pixel_masks_1[src_x & 7] ? 0xff : 0; + do_rop_codes_mask_8( dst, src_val, codes, pixel_masks_1[dst_x & 7] ); + if ((src_x & 7) == 7) src++; + if ((dst_x & 7) == 7) dst++; + } +} + static void solid_rects_32(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) { DWORD *ptr, *start; @@ -706,9 +757,7 @@ static void copy_rect_32(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - for (x = rc->left, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++) - do_rop_codes_32( dst_ptr++, *src_ptr++, &codes ); - + do_rop_codes_line_32( dst_start, src_start, &codes, rc->right - rc->left ); dst_start += dst->stride / 4; src_start += src->stride / 4; } @@ -750,12 +799,7 @@ static void copy_rect_24(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - for (x = rc->left, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++) - { - do_rop_codes_8( dst_ptr++, *src_ptr++, &codes ); - do_rop_codes_8( dst_ptr++, *src_ptr++, &codes ); - do_rop_codes_8( dst_ptr++, *src_ptr++, &codes ); - } + do_rop_codes_line_8( dst_start, src_start, &codes, (rc->right - rc->left) * 3 ); dst_start += dst->stride; src_start += src->stride; } @@ -797,9 +841,7 @@ static void copy_rect_16(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - for (x = rc->left, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++) - do_rop_codes_16( dst_ptr++, *src_ptr++, &codes ); - + do_rop_codes_line_16( dst_start, src_start, &codes, rc->right - rc->left ); dst_start += dst->stride / 2; src_start += src->stride / 2; } @@ -841,9 +883,7 @@ static void copy_rect_8(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - for (x = rc->left, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++) - do_rop_codes_8( dst_ptr++, *src_ptr++, &codes ); - + do_rop_codes_line_8( dst_start, src_start, &codes, rc->right - rc->left ); dst_start += dst->stride; src_start += src->stride; } @@ -888,21 +928,7 @@ static void copy_rect_4(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - for (x = rc->left, src_x = origin->x, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++, src_x++) - { - if (x & 1) - { - if (src_x & 1) src_val = *src_ptr++; - else src_val = *src_ptr >> 4; - do_rop_codes_mask_8( dst_ptr++, src_val, &codes, 0x0f ); - } - else - { - if (src_x & 1) src_val = *src_ptr++ << 4; - else src_val = *src_ptr; - do_rop_codes_mask_8( dst_ptr, src_val, &codes, 0xf0 ); - } - } + do_rop_codes_line_4( dst_start, rc->left, src_start, origin->x, &codes, rc->right - rc->left ); dst_start += dst->stride; src_start += src->stride; } @@ -947,15 +973,7 @@ static void copy_rect_1(const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); for (y = rc->top; y < rc->bottom; y++) { - dst_bitpos = rc->left & 7; - src_bitpos = origin->x & 7; - for (x = rc->left, dst_ptr = dst_start, src_ptr = src_start; x < rc->right; x++) - { - src_val = *src_ptr & pixel_masks_1[src_bitpos] ? 0xff : 0; - do_rop_codes_mask_8( dst_ptr, src_val, &codes, pixel_masks_1[dst_bitpos] ); - if (dst_bitpos++ == 7) { dst_ptr++, dst_bitpos = 0; } - if (src_bitpos++ == 7) { src_ptr++, src_bitpos = 0; } - } + do_rop_codes_line_1( dst_start, rc->left, src_start, origin->x, &codes, rc->right - rc->left ); dst_start += dst->stride; src_start += src->stride; }

1 0

Alexandre Julliard : gdi32: Copy DIB rectangles in the correct order when source and destination overlap .
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 3ace50119075d51455e6081a48459f1cf09a8c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ace50119075d51455e6081a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 10:11:27 2011 +0200 gdi32: Copy DIB rectangles in the correct order when source and destination overlap. --- dlls/gdi32/dibdrv/bitblt.c | 102 +++++++++++++++++++++++++++++++++++++++++--- dlls/gdi32/dibdrv/dibdrv.h | 5 ++ 2 files changed, 101 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 1d41e11..94ae266 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -431,28 +431,118 @@ static const unsigned char BITBLT_Opcodes[256][MAX_OP_LEN] = { OP(PAT,DST,R2_WHITE) } /* 0xff 1 */ }; +static int get_overlap( const dib_info *dst, const RECT *dst_rect, + const dib_info *src, const RECT *src_rect ) +{ + const char *src_top, *dst_top; + int height, ret = 0; + + if (dst->stride != src->stride) return 0; /* can't be the same dib */ + if (dst_rect->right <= src_rect->left) return 0; + if (dst_rect->left >= src_rect->right) return 0; + + src_top = (const char *)src->bits.ptr + src_rect->top * src->stride; + dst_top = (const char *)dst->bits.ptr + dst_rect->top * dst->stride; + height = (dst_rect->bottom - dst_rect->top) * dst->stride; + + if (dst->stride > 0) + { + if (src_top >= dst_top + height) return 0; + if (src_top + height <= dst_top) return 0; + if (dst_top < src_top) ret |= OVERLAP_ABOVE; + else if (dst_top > src_top) ret |= OVERLAP_BELOW; + } + else + { + if (src_top <= dst_top + height) return 0; + if (src_top + height >= dst_top) return 0; + if (dst_top > src_top) ret |= OVERLAP_ABOVE; + else if (dst_top < src_top) ret |= OVERLAP_BELOW; + } + + if (dst_rect->left < src_rect->left) ret |= OVERLAP_LEFT; + else if (dst_rect->left > src_rect->left) ret |= OVERLAP_RIGHT; + + return ret; +} + static DWORD copy_rect( dib_info *dst, const RECT *dst_rect, const dib_info *src, const RECT *src_rect, HRGN clip, INT rop2 ) { POINT origin; RECT clipped_rect; const WINEREGION *clip_data; - int i; + int i, start, end, overlap; origin.x = src_rect->left; origin.y = src_rect->top; + overlap = get_overlap( dst, dst_rect, src, src_rect ); if (clip == NULL) dst->funcs->copy_rect( dst, dst_rect, src, &origin, rop2 ); else { clip_data = get_wine_region( clip ); - for (i = 0; i < clip_data->numRects; i++) + if (overlap & OVERLAP_BELOW) + { + if (overlap & OVERLAP_RIGHT) /* right to left, bottom to top */ + { + for (i = clip_data->numRects - 1; i >= 0; i--) + { + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } + } + } + else /* left to right, bottom to top */ + { + for (start = clip_data->numRects - 1; start >= 0; start = end) + { + for (end = start - 1; end >= 0; end--) + if (clip_data->rects[start].top != clip_data->rects[end].top) break; + + for (i = end + 1; i <= start; i++) + { + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } + } + } + } + } + else if (overlap & OVERLAP_RIGHT) /* right to left, top to bottom */ + { + for (start = 0; start < clip_data->numRects; start = end) + { + for (end = start + 1; end < clip_data->numRects; end++) + if (clip_data->rects[start].top != clip_data->rects[end].top) break; + + for (i = end - 1; i >= start; i--) + { + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } + } + } + } + else /* left to right, top to bottom */ { - if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + for (i = 0; i < clip_data->numRects; i++) { - origin.x = src_rect->left + clipped_rect.left - dst_rect->left; - origin.y = src_rect->top + clipped_rect.top - dst_rect->top; - dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } } } release_wine_region( clip ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 7f0d697..8130900 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -147,6 +147,11 @@ struct rop_codes DWORD a1, a2, x1, x2; }; +#define OVERLAP_LEFT 0x01 /* dest starts left of source */ +#define OVERLAP_RIGHT 0x02 /* dest starts right of source */ +#define OVERLAP_ABOVE 0x04 /* dest starts above source */ +#define OVERLAP_BELOW 0x08 /* dest starts below source */ + extern void get_rop_codes(INT rop, struct rop_codes *codes); extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : server: Try writing to /proc/<pid>/ mem in write_process_memory().
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: e7728c413298025077054187d57e6a7783b3de38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7728c413298025077054187d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:43 2011 +0200 server: Try writing to /proc/<pid>/mem in write_process_memory(). --- server/ptrace.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 51157ab..6c14481 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -463,6 +463,25 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t set_error( STATUS_ACCESS_DENIED ); goto done; } + + if (len > 3) + { + char procmem[24]; + int fd; + + sprintf( procmem, "/proc/%u/mem", process->unix_pid ); + if ((fd = open( procmem, O_WRONLY )) != -1) + { + ssize_t r = pwrite( fd, src, size, ptr ); + close( fd ); + if (r == size) + { + ret = 1; + goto done; + } + } + } + /* first word is special */ if (len > 1) {

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_device_caps() const.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 72d75b65b7a162be612b6cfd3cc9794bf8dd7b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d75b65b7a162be612b6cfd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:46 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_device_caps() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f598ea3..fad63e4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3913,7 +3913,7 @@ HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_device_caps(struct wined3d_device *device, WINED3DCAPS *caps) +HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a6071ea..edc2e40 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2215,7 +2215,7 @@ HRESULT __cdecl wined3d_device_get_creation_parameters(struct wined3d_device *de HRESULT __cdecl wined3d_device_get_current_texture_palette(struct wined3d_device *device, UINT *palette_idx); HRESULT __cdecl wined3d_device_get_depth_stencil(struct wined3d_device *device, struct wined3d_surface **depth_stencil); -HRESULT __cdecl wined3d_device_get_device_caps(struct wined3d_device *device, WINED3DCAPS *caps); +HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(struct wined3d_device *device, UINT swapchain_idx, WINED3DDISPLAYMODE *mode); HRESULT __cdecl wined3d_device_get_front_buffer_data(struct wined3d_device *device,

1 0

Alexandre Julliard : user32/tests: Try harder to flush paint events before checking the window contents.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: a684b634c01a58633e65b1c4dd1f70f5c99530ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a684b634c01a58633e65b1c4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 09:35:05 2011 +0200 user32/tests: Try harder to flush paint events before checking the window contents. --- dlls/user32/tests/static.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index b761356..62089bd 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -40,6 +40,22 @@ static HWND hMainWnd; static int g_nReceivedColorStatic = 0; +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + static HWND build_static(DWORD style) { return CreateWindow("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); @@ -70,6 +86,7 @@ static void test_updates(int style, int flags) HWND hStatic = build_static(style); int exp; + flush_events(); trace("Testing style 0x%x\n", style); g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ @@ -122,7 +139,6 @@ START_TEST(static) hMainWnd = CreateWindow(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandle(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); - UpdateWindow(hMainWnd); test_updates(0, 0); test_updates(SS_SIMPLE, 0);

1 0