October 2009 - Wine-Commits

Paul Vriens : user32/tests: Don't crash on Win9x/WinMe/NT4.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: fda70b97f4d2fac1a73f8f3cba6d036a40f43ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda70b97f4d2fac1a73f8f3cb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Sep 30 21:00:33 2009 +0200 user32/tests: Don't crash on Win9x/WinMe/NT4. --- dlls/user32/tests/msg.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index aeb1b62..57931cf 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7862,7 +7862,21 @@ static void test_timers(void) ok( KillTimer(info.hWnd, TIMER_ID), "KillTimer failed\n"); + ok(DestroyWindow(info.hWnd), "failed to destroy window\n"); + /* Test timer callback with crash */ + SetLastError(0xdeadbeef); + info.hWnd = CreateWindowW(testWindowClassW, NULL, + WS_OVERLAPPEDWINDOW , + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, + NULL, NULL, 0); + if ((!info.hWnd && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) || /* Win9x/Me */ + (!pGetMenuInfo)) /* Win95/NT4 */ + { + win_skip("Test would crash on Win9x/WinMe/NT4\n"); + DestroyWindow(info.hWnd); + return; + } info.id = SetTimer(info.hWnd, TIMER_ID, 0, tfunc_crash); ok(info.id, "SetTimer failed\n"); Sleep(150);

1 0

Jacek Caban : mshtml: Return HTMLDocumentNode object in ScriptHost:: QueryService for SID_SInternetHostSecurityManager.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: b6dff3f733120c33095b03cda68251987fb4abf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6dff3f733120c33095b03cda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 23:59:28 2009 +0200 mshtml: Return HTMLDocumentNode object in ScriptHost::QueryService for SID_SInternetHostSecurityManager. --- dlls/mshtml/script.c | 10 ++++++++++ dlls/mshtml/tests/script.c | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index c242242..5c83e1e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -557,6 +557,16 @@ static HRESULT WINAPI ASServiceProvider_QueryService(IServiceProvider *iface, RE REFIID riid, void **ppv) { ScriptHost *This = SERVPROV_THIS(iface); + + if(IsEqualGUID(&SID_SInternetHostSecurityManager, guidService)) { + TRACE("(%p)->(SID_SInternetHostSecurityManager)\n", This); + + if(!This->window || !This->window->doc) + return E_NOINTERFACE; + + return IInternetHostSecurityManager_QueryInterface(HOSTSECMGR(This->window->doc), riid, ppv); + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return E_NOINTERFACE; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 6c6504b..92897a6 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -571,6 +571,23 @@ static const IObjectSafetyVtbl ObjectSafetyVtbl = { static IObjectSafety ObjectSafety = { &ObjectSafetyVtbl }; +static void test_security(void) +{ + IInternetHostSecurityManager *sec_mgr; + IServiceProvider *sp; + HRESULT hres; + + hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(sp, &SID_SInternetHostSecurityManager, + &IID_IInternetHostSecurityManager, (void**)&sec_mgr); + IServiceProvider_Release(sp); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + + IInternetHostSecurityManager_Release(sec_mgr); +} + static HRESULT WINAPI ActiveScriptProperty_QueryInterface(IActiveScriptProperty *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -960,6 +977,8 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(script_testprop_i); + test_security(); + return S_OK; }

1 0

Alexandre Julliard : winex11: Move the DIB locking and the client-side optimizations into BITBLT_InternalStretchBlt .
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 77b9b8a307711bd1f6da30f7d2d5e04faa3f5092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b9b8a307711bd1f6da30f7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 30 20:39:51 2009 +0200 winex11: Move the DIB locking and the client-side optimizations into BITBLT_InternalStretchBlt. This way they also apply to the non-stretching StretchBlt case. --- dlls/winex11.drv/bitblt.c | 161 ++++++++++++++------------------------------- 1 files changed, 49 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77b9b8a307711bd1f6da3…

1 0

Alexandre Julliard : gdi32: Fall back to StretchBlt if the driver doesn' t export PatBlt or BitBlt.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: ab15d132906997ff7a9557a92b7dc9858c0f5340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab15d132906997ff7a9557a92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 30 20:55:26 2009 +0200 gdi32: Fall back to StretchBlt if the driver doesn't export PatBlt or BitBlt. --- dlls/gdi32/bitblt.c | 19 +++++++++++++++---- dlls/gdi32/mfdrv/bitblt.c | 12 ------------ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 3 --- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 46c7f6f..f638a73 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -47,12 +47,18 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, if (!dc) return FALSE; + TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop ); + if (dc->funcs->pPatBlt) { - TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop ); update_dc( dc ); bRet = dc->funcs->pPatBlt( dc->physDev, left, top, width, height, rop ); } + else if (dc->funcs->pStretchBlt) + { + update_dc( dc ); + bRet = dc->funcs->pStretchBlt( dc->physDev, left, top, width, height, NULL, 0, 0, 0, 0, rop ); + } release_dc_ptr( dc ); return bRet; } @@ -72,14 +78,19 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; - if (dcDst->funcs->pBitBlt) + if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) { update_dc( dcDst ); dcSrc = get_dc_ptr( hdcSrc ); if (dcSrc) update_dc( dcSrc ); - ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, - dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); + if (dcDst->funcs->pBitBlt) + ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, + dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); + else + ret = dcDst->funcs->pStretchBlt( dcDst->physDev, xDst, yDst, width, height, + dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, + width, height, rop ); release_dc_ptr( dcDst ); if (dcSrc) release_dc_ptr( dcSrc ); diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index 85d4b16..c09148f 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -36,18 +36,6 @@ BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, INT left, INT top, INT width, INT height, /*********************************************************************** - * MFDRV_BitBlt - */ -BOOL CDECL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height, - PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop ) -{ - return MFDRV_StretchBlt(devDst, xDst, yDst, width, height, devSrc, - xSrc, ySrc, width, height, rop); -} - - - -/*********************************************************************** * MFDRV_StretchBlt * this function contains TWO ways for processing StretchBlt in metafiles, * decide between rdFunction values META_STRETCHBLT or META_DIBSTRETCHBLT diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index b6cf549..59c973a 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -38,7 +38,7 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_Arc, /* pArc */ NULL, /* pArcTo */ MFDRV_BeginPath, /* pBeginPath */ - MFDRV_BitBlt, /* pBitBlt */ + NULL, /* pBitBlt */ NULL, /* pChoosePixelFormat */ MFDRV_Chord, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index bdef966..b15864c 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -64,9 +64,6 @@ extern BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, - INT height, PHYSDEV devSrc, INT xSrc, INT ySrc, - DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : urlmon: Correctly handle pPolicy and pContext arguments in ProcessUrlAction.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 7f11de868245e10b0b57411d3d1926af4d57baed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f11de868245e10b0b57411d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 23:59:47 2009 +0200 urlmon: Correctly handle pPolicy and pContext arguments in ProcessUrlAction. --- dlls/urlmon/sec_mgr.c | 4 ++- dlls/urlmon/tests/sec_mgr.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 9d0e799..173fad7 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -536,7 +536,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager * return hres; } - if(pContext || cbContext || dwFlags || dwReserved) + if(dwFlags || dwReserved) FIXME("Unsupported arguments\n"); if(!pwszUrl) @@ -551,6 +551,8 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager * return hres; TRACE("policy %x\n", policy); + if(cbPolicy >= sizeof(DWORD)) + *(DWORD*)pPolicy = policy; switch(GetUrlPolicyPermissions(policy)) { case URLPOLICY_ALLOW: diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2df702c..80a4552 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -68,6 +68,9 @@ static const BYTE secid10[] = static const BYTE secid10_2[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e','.','j','p','g',3,0,0,0}; +static const GUID CLSID_TestActiveX = + {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; + static struct secmgr_test { LPCWSTR url; DWORD zone; @@ -242,6 +245,33 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag else ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres); ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); + + policy = 0xdeadbeef; + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy, + 2, NULL, 0, 0, 0); + if(reg_policy == URLPOLICY_DISALLOW) + ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); + else + ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres); + ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); + + policy = 0xdeadbeef; + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy, + sizeof(DWORD), NULL, 0, 0, 0); + if(reg_policy == URLPOLICY_DISALLOW) + ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); + else + ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres); + ok(policy == reg_policy, "(%x) policy=%x\n", action, policy); + + policy = 0xdeadbeef; + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy, + sizeof(WCHAR), (BYTE*)0xdeadbeef, 16, 0, 0); + if(reg_policy == URLPOLICY_DISALLOW) + ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); + else + ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres); + ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); }else { skip("IE running in Enhanced Security Configuration\n"); } @@ -265,6 +295,18 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); } +static void test_activex(IInternetSecurityManager *secmgr) +{ + DWORD policy; + HRESULT hres; + + policy = 0xdeadbeef; + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, URLACTION_ACTIVEX_RUN, (BYTE*)&policy, + sizeof(DWORD), (BYTE*)&CLSID_TestActiveX, sizeof(CLSID), 0, 0); + ok(hres == S_OK, "ProcessUrlAction(URLACTION_ACTIVEX_RUN) failed: %08x\n", hres); + ok(policy == URLPOLICY_ALLOW || policy == URLPOLICY_DISALLOW, "policy = %x\n", policy); +} + static void test_polices(void) { IInternetZoneManager *zonemgr = NULL; @@ -277,12 +319,15 @@ static void test_polices(void) ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres); test_url_action(secmgr, zonemgr, URLACTION_SCRIPT_RUN); + test_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_RUN); test_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_OVERRIDE_OBJECT_SAFETY); test_url_action(secmgr, zonemgr, URLACTION_CHANNEL_SOFTDIST_PERMISSIONS); test_url_action(secmgr, zonemgr, 0xdeadbeef); test_special_url_action(secmgr, zonemgr, URLACTION_SCRIPT_OVERRIDE_SAFETY); + test_activex(secmgr); + IInternetSecurityManager_Release(secmgr); IInternetZoneManager_Release(zonemgr); }

1 0

Jacek Caban : mshtml: Added IInternetHostSecurity:: ProcessUrlAction implementation.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: a5923a6eea5a5c672544c41d0d0be92f72fe9946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5923a6eea5a5c672544c41d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 00:05:36 2009 +0200 mshtml: Added IInternetHostSecurity::ProcessUrlAction implementation. --- dlls/mshtml/htmldoc.c | 10 ++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/secmgr.c | 12 ++++++++++-- dlls/mshtml/tests/script.c | 8 ++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index bfde79d..d6baa8e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1772,6 +1772,9 @@ void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = HTMLDOCNODE_NODE_THIS(iface); + if(This->secmgr) + IInternetSecurityManager_Release(This->secmgr); + detach_selection(This); detach_ranges(This); release_nodes(This); @@ -1805,6 +1808,7 @@ static dispex_static_data_t HTMLDocumentNode_dispex = { HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLWindow *window, HTMLDocumentNode **ret) { HTMLDocumentNode *doc; + HRESULT hres; doc = heap_alloc_zero(sizeof(HTMLDocumentNode)); if(!doc) @@ -1829,6 +1833,12 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); doc->node.vtbl = &HTMLDocumentNodeImplVtbl; + hres = CoInternetCreateSecurityManager(NULL, &doc->secmgr, 0); + if(FAILED(hres)) { + htmldoc_release(&doc->basedoc); + return hres; + } + *ret = doc; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 17fa971..82e1c60 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -471,6 +471,8 @@ struct HTMLDocumentNode { HTMLDOMNode *nodes; + IInternetSecurityManager *secmgr; + struct list selection_list; struct list range_list; }; diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index 617cb23..c9b1e46 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + #define HOSTSECMGR_THIS(iface) DEFINE_THIS(HTMLDocumentNode, IInternetHostSecurityManager, iface) static HRESULT WINAPI InternetHostSecurityManager_QueryInterface(IInternetHostSecurityManager *iface, REFIID riid, void **ppv) @@ -66,8 +68,14 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost BYTE *pPolicy, DWORD cbPolicy, BYTE *pContext, DWORD cbContext, DWORD dwFlags, DWORD dwReserved) { HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); - FIXME("%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); - return E_NOTIMPL; + const WCHAR *url; + + TRACE("%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); + + url = This->basedoc.doc_obj->url ? This->basedoc.doc_obj->url : about_blankW; + + return IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, dwAction, pPolicy, cbPolicy, + pContext, cbContext, dwFlags, dwReserved); } static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHostSecurityManager *iface, REFGUID guidKey, diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 92897a6..89b076c 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -117,6 +117,8 @@ DEFINE_EXPECT(script_testprop_i); static const GUID CLSID_TestScript = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; +static const GUID CLSID_TestActiveX = + {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; static IHTMLDocument2 *notif_doc; static IDispatchEx *window_dispex; @@ -575,6 +577,7 @@ static void test_security(void) { IInternetHostSecurityManager *sec_mgr; IServiceProvider *sp; + DWORD policy; HRESULT hres; hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); @@ -585,6 +588,11 @@ static void test_security(void) IServiceProvider_Release(sp); ok(hres == S_OK, "QueryService failed: %08x\n", hres); + hres = IInternetHostSecurityManager_ProcessUrlAction(sec_mgr, URLACTION_ACTIVEX_RUN, (BYTE*)&policy, sizeof(policy), + (BYTE*)&CLSID_TestActiveX, sizeof(CLSID), 0, 0); + ok(hres == S_OK, "ProcessUrlAction failed: %08x\n", hres); + ok(policy == URLPOLICY_ALLOW, "policy = %x\n", policy); + IInternetHostSecurityManager_Release(sec_mgr); }

1 0

Alexandre Julliard : winex11: Move X11DRV_ClientSideDIBCopy to avoid forward declarations.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 7bc4b074fcc9bab63758004692a7fe3deddf6d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc4b074fcc9bab6375800469… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 30 20:35:28 2009 +0200 winex11: Move X11DRV_ClientSideDIBCopy to avoid forward declarations. Change the name to reflect that it's a purely internal function. --- dlls/winex11.drv/bitblt.c | 246 ++++++++++++++++++++++----------------------- 1 files changed, 122 insertions(+), 124 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 119ac5b..250bf98 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1231,6 +1231,127 @@ static BOOL BITBLT_GetVisRectangles( X11DRV_PDEVICE *physDevDst, INT xDst, INT y /*********************************************************************** + * client_side_dib_copy + */ +static BOOL client_side_dib_copy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, + X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, + INT width, INT height ) +{ + DIBSECTION srcDib, dstDib; + BYTE *srcPtr, *dstPtr; + INT srcRowOffset, dstRowOffset; + INT bytesPerPixel; + INT bytesToCopy; + INT y; + static RECT unusedRect; + + if (GetObjectW(physDevSrc->bitmap->hbitmap, sizeof(srcDib), &srcDib) != sizeof(srcDib)) + return FALSE; + if (GetObjectW(physDevDst->bitmap->hbitmap, sizeof(dstDib), &dstDib) != sizeof(dstDib)) + return FALSE; + + /* check for oversized values, just like X11DRV_DIB_CopyDIBSection() */ + if (xSrc > srcDib.dsBm.bmWidth || ySrc > srcDib.dsBm.bmHeight) + return FALSE; + if (xSrc + width > srcDib.dsBm.bmWidth) + width = srcDib.dsBm.bmWidth - xSrc; + if (ySrc + height > srcDib.dsBm.bmHeight) + height = srcDib.dsBm.bmHeight - ySrc; + + if (GetRgnBox(physDevDst->region, &unusedRect) == COMPLEXREGION) + { + /* for simple regions, the clipping was already done by BITBLT_GetVisRectangles */ + FIXME("potential optimization: client-side complex region clipping\n"); + return FALSE; + } + if (dstDib.dsBm.bmBitsPixel <= 8) + { + FIXME("potential optimization: client-side color-index mode DIB copy\n"); + return FALSE; + } + if (!(srcDib.dsBmih.biCompression == BI_BITFIELDS && + dstDib.dsBmih.biCompression == BI_BITFIELDS && + !memcmp(srcDib.dsBitfields, dstDib.dsBitfields, 3*sizeof(DWORD))) + && !(srcDib.dsBmih.biCompression == BI_RGB && + dstDib.dsBmih.biCompression == BI_RGB)) + { + FIXME("potential optimization: client-side compressed DIB copy\n"); + return FALSE; + } + if (srcDib.dsBm.bmBitsPixel != dstDib.dsBm.bmBitsPixel) + { + FIXME("potential optimization: pixel format conversion\n"); + return FALSE; + } + if (srcDib.dsBmih.biWidth < 0 || dstDib.dsBmih.biWidth < 0) + { + FIXME("negative widths not yet implemented\n"); + return FALSE; + } + + switch (dstDib.dsBm.bmBitsPixel) + { + case 15: + case 16: + bytesPerPixel = 2; + break; + case 24: + bytesPerPixel = 3; + break; + case 32: + bytesPerPixel = 4; + break; + default: + FIXME("don't know how to work with a depth of %d\n", physDevSrc->depth); + return FALSE; + } + + bytesToCopy = width * bytesPerPixel; + + if (srcDib.dsBmih.biHeight < 0) + { + srcPtr = &physDevSrc->bitmap->base[ySrc*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; + srcRowOffset = srcDib.dsBm.bmWidthBytes; + } + else + { + srcPtr = &physDevSrc->bitmap->base[(srcDib.dsBm.bmHeight-ySrc-1)*srcDib.dsBm.bmWidthBytes + + xSrc*bytesPerPixel]; + srcRowOffset = -srcDib.dsBm.bmWidthBytes; + } + if (dstDib.dsBmih.biHeight < 0) + { + dstPtr = &physDevDst->bitmap->base[yDst*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; + dstRowOffset = dstDib.dsBm.bmWidthBytes; + } + else + { + dstPtr = &physDevDst->bitmap->base[(dstDib.dsBm.bmHeight-yDst-1)*dstDib.dsBm.bmWidthBytes + + xDst*bytesPerPixel]; + dstRowOffset = -dstDib.dsBm.bmWidthBytes; + } + + /* Handle overlapping regions on the same DIB */ + if (physDevSrc == physDevDst && ySrc < yDst) + { + srcPtr += srcRowOffset * (height - 1); + srcRowOffset = -srcRowOffset; + dstPtr += dstRowOffset * (height - 1); + dstRowOffset = -dstRowOffset; + } + + for (y = yDst; y < yDst + height; ++y) + { + memmove(dstPtr, srcPtr, bytesToCopy); + srcPtr += srcRowOffset; + dstPtr += dstRowOffset; + } + + return TRUE; +} + + +/*********************************************************************** * BITBLT_InternalStretchBlt * * Implementation of PatBlt(), BitBlt() and StretchBlt(). @@ -1520,127 +1641,6 @@ BOOL CDECL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top, INT width, /*********************************************************************** - * X11DRV_ClientSideDIBCopy - */ -static BOOL X11DRV_ClientSideDIBCopy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, - X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT width, INT height ) -{ - DIBSECTION srcDib, dstDib; - BYTE *srcPtr, *dstPtr; - INT srcRowOffset, dstRowOffset; - INT bytesPerPixel; - INT bytesToCopy; - INT y; - static RECT unusedRect; - - if (GetObjectW(physDevSrc->bitmap->hbitmap, sizeof(srcDib), &srcDib) != sizeof(srcDib)) - return FALSE; - if (GetObjectW(physDevDst->bitmap->hbitmap, sizeof(dstDib), &dstDib) != sizeof(dstDib)) - return FALSE; - - /* check for oversized values, just like X11DRV_DIB_CopyDIBSection() */ - if (xSrc > srcDib.dsBm.bmWidth || ySrc > srcDib.dsBm.bmHeight) - return FALSE; - if (xSrc + width > srcDib.dsBm.bmWidth) - width = srcDib.dsBm.bmWidth - xSrc; - if (ySrc + height > srcDib.dsBm.bmHeight) - height = srcDib.dsBm.bmHeight - ySrc; - - if (GetRgnBox(physDevDst->region, &unusedRect) == COMPLEXREGION) - { - /* for simple regions, the clipping was already done by BITBLT_GetVisRectangles */ - FIXME("potential optimization: client-side complex region clipping\n"); - return FALSE; - } - if (dstDib.dsBm.bmBitsPixel <= 8) - { - FIXME("potential optimization: client-side color-index mode DIB copy\n"); - return FALSE; - } - if (!(srcDib.dsBmih.biCompression == BI_BITFIELDS && - dstDib.dsBmih.biCompression == BI_BITFIELDS && - !memcmp(srcDib.dsBitfields, dstDib.dsBitfields, 3*sizeof(DWORD))) - && !(srcDib.dsBmih.biCompression == BI_RGB && - dstDib.dsBmih.biCompression == BI_RGB)) - { - FIXME("potential optimization: client-side compressed DIB copy\n"); - return FALSE; - } - if (srcDib.dsBm.bmBitsPixel != dstDib.dsBm.bmBitsPixel) - { - FIXME("potential optimization: pixel format conversion\n"); - return FALSE; - } - if (srcDib.dsBmih.biWidth < 0 || dstDib.dsBmih.biWidth < 0) - { - FIXME("negative widths not yet implemented\n"); - return FALSE; - } - - switch (dstDib.dsBm.bmBitsPixel) - { - case 15: - case 16: - bytesPerPixel = 2; - break; - case 24: - bytesPerPixel = 3; - break; - case 32: - bytesPerPixel = 4; - break; - default: - FIXME("don't know how to work with a depth of %d\n", physDevSrc->depth); - return FALSE; - } - - bytesToCopy = width * bytesPerPixel; - - if (srcDib.dsBmih.biHeight < 0) - { - srcPtr = &physDevSrc->bitmap->base[ySrc*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; - srcRowOffset = srcDib.dsBm.bmWidthBytes; - } - else - { - srcPtr = &physDevSrc->bitmap->base[(srcDib.dsBm.bmHeight-ySrc-1)*srcDib.dsBm.bmWidthBytes - + xSrc*bytesPerPixel]; - srcRowOffset = -srcDib.dsBm.bmWidthBytes; - } - if (dstDib.dsBmih.biHeight < 0) - { - dstPtr = &physDevDst->bitmap->base[yDst*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; - dstRowOffset = dstDib.dsBm.bmWidthBytes; - } - else - { - dstPtr = &physDevDst->bitmap->base[(dstDib.dsBm.bmHeight-yDst-1)*dstDib.dsBm.bmWidthBytes - + xDst*bytesPerPixel]; - dstRowOffset = -dstDib.dsBm.bmWidthBytes; - } - - /* Handle overlapping regions on the same DIB */ - if (physDevSrc == physDevDst && ySrc < yDst) - { - srcPtr += srcRowOffset * (height - 1); - srcRowOffset = -srcRowOffset; - dstPtr += dstRowOffset * (height - 1); - dstRowOffset = -dstRowOffset; - } - - for (y = yDst; y < yDst + height; ++y) - { - memmove(dstPtr, srcPtr, bytesToCopy); - srcPtr += srcRowOffset; - dstPtr += dstRowOffset; - } - - return TRUE; -} - - -/*********************************************************************** * X11DRV_BitBlt */ BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, @@ -1705,9 +1705,7 @@ BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, height = visRectDst.bottom - visRectDst.top; if (sDst == DIB_Status_AppMod) { - result = X11DRV_ClientSideDIBCopy( physDevSrc, xSrc, ySrc, - physDevDst, xDst, yDst, - width, height ); + result = client_side_dib_copy( physDevSrc, xSrc, ySrc, physDevDst, xDst, yDst, width, height ); if (result) goto END; /* fall back to X server copying */

1 0