February 2006 - Wine-commits

H. Verbeet : wined3d: Release the container during surface / volume cleanup .
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: bac34c35aaa4160939bc5bb3cd801636ab8f5187 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bac34c35aaa4160939bc5bb… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Feb 10 14:52:20 2006 +0100 wined3d: Release the container during surface / volume cleanup. --- dlls/wined3d/surface.c | 3 +++ dlls/wined3d/volume.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 722816a..ab25c96 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -69,6 +69,9 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release glDeleteTextures(1, &This->glDescription.textureName); LEAVE_GL(); } + if (This->container) { + IWineD3DBase_Release(This->container); + } IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); TRACE("(%p) Released\n", This); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3108662..0c367bc 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -55,6 +55,9 @@ ULONG WINAPI IWineD3DVolumeImpl_Release( TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); ref = InterlockedDecrement(&This->resource.ref); if (ref == 0) { + if (This->container) { + IWineD3DBase_Release(This->container); + } IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); HeapFree(GetProcessHeap(), 0, This); }

1 0

H. Verbeet : d3d9: Use an invisible window for tests.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: 75ac954cf5e84c6855cbcae4184b2f7ff0c3de1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75ac954cf5e84c6855cbcae… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Feb 10 14:52:10 2006 +0100 d3d9: Use an invisible window for tests. --- dlls/d3d9/tests/shader.c | 13 ++++++++++++- dlls/d3d9/tests/stateblock.c | 13 ++++++++++++- dlls/d3d9/tests/vertexdeclaration.c | 13 ++++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 563d5fa..f9ab6cf 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -22,6 +22,17 @@ static HMODULE d3d9_handle = 0; +static HWND create_window(void) +{ + WNDCLASS wc = {0}; + wc.lpfnWndProc = &DefWindowProc; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClass(&wc); + + return CreateWindow("d3d9_test_wc", "d3d9_test", + 0, 0, 0, 0, 0, 0, 0, 0, 0); +} + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; @@ -40,7 +51,7 @@ static IDirect3DDevice9 *init_d3d9(void) ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = GetDesktopWindow(); + present_parameters.hDeviceWindow = create_window(); present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index a5b1938..4e3aca5 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -21,6 +21,17 @@ static HMODULE d3d9_handle = 0; +static HWND create_window(void) +{ + WNDCLASS wc = {0}; + wc.lpfnWndProc = &DefWindowProc; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClass(&wc); + + return CreateWindow("d3d9_test_wc", "d3d9_test", + 0, 0, 0, 0, 0, 0, 0, 0, 0); +} + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; @@ -39,7 +50,7 @@ static IDirect3DDevice9 *init_d3d9(void) ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = GetDesktopWindow(); + present_parameters.hDeviceWindow = create_window(); present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index b9e0f2a..b6e380a 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -22,6 +22,17 @@ static HMODULE d3d9_handle = 0; +static HWND create_window(void) +{ + WNDCLASS wc = {0}; + wc.lpfnWndProc = &DefWindowProc; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClass(&wc); + + return CreateWindow("d3d9_test_wc", "d3d9_test", + 0, 0, 0, 0, 0, 0, 0, 0, 0); +} + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; @@ -40,7 +51,7 @@ static IDirect3DDevice9 *init_d3d9(void) ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = GetDesktopWindow(); + present_parameters.hDeviceWindow = create_window(); present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr);

1 0

Robert Shearman : secur32: Improve tracing.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: 81d9e10533faf4fc1b43b77749f30493dd885b5f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81d9e10533faf4fc1b43b77… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 10 14:51:59 2006 +0100 secur32: Improve tracing. Improve the tracing for functions that can be called by the app, but bypass the relay code. --- dlls/secur32/secur32.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 1aee7ec..f3a3e23 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -703,6 +703,8 @@ SECURITY_STATUS WINAPI EnumerateSecurity { SECURITY_STATUS ret = SEC_E_OK; + TRACE("(%p, %p)\n", pcPackages, ppPackageInfo); + /* windows just crashes if pcPackages or ppPackageInfo is NULL, so will I */ *pcPackages = 0; EnterCriticalSection(&cs); @@ -737,6 +739,7 @@ SECURITY_STATUS WINAPI EnumerateSecurity memcpy(pkgInfo, &package->infoW, sizeof(SecPkgInfoW)); if (package->infoW.Name) { + TRACE("Name[%ld] = %s\n", i - 1, debugstr_w(package->infoW.Name)); pkgInfo->Name = nextString; lstrcpyW(nextString, package->infoW.Name); nextString += lstrlenW(nextString) + 1; @@ -745,6 +748,7 @@ SECURITY_STATUS WINAPI EnumerateSecurity pkgInfo->Name = NULL; if (package->infoW.Comment) { + TRACE("Comment[%ld] = %s\n", i - 1, debugstr_w(package->infoW.Comment)); pkgInfo->Comment = nextString; lstrcpyW(nextString, package->infoW.Comment); nextString += lstrlenW(nextString) + 1; @@ -758,6 +762,7 @@ SECURITY_STATUS WINAPI EnumerateSecurity } } LeaveCriticalSection(&cs); + TRACE("<-- 0x%08lx\n", ret); return ret; }

1 0

Robert Shearman : widl: Fix a typo when removing TYPEFLAG_FDUAL.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: 59dd416fd2064fce34c86a524e2a0f12a99f70a8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59dd416fd2064fce34c86a5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 10 14:51:39 2006 +0100 widl: Fix a typo when removing TYPEFLAG_FDUAL. --- tools/widl/write_msft.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 725b361..ffbe9f8 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1877,7 +1877,7 @@ static void add_interface_typeinfo(msft_ /* can't be dual if it doesn't derive from IDispatch */ if (!(msft_typeinfo->typeinfo->flags & 0x1000)) /* TYPEFLAG_FDISPATCHABLE */ - msft_typeinfo->typeinfo->flags &= 0x40; /* TYPEFLAG_FDUAL */ + msft_typeinfo->typeinfo->flags &= ~0x40; /* TYPEFLAG_FDUAL */ if(interface->ref) add_impl_type(msft_typeinfo, interface->ref);

1 0

Robert Shearman : Return the correct error code from IConnectionPointContainer:: FindConnectionPoint.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: 98fd1c5678a76ac4ce6e805228274581f7a7747a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98fd1c5678a76ac4ce6e805… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 10 14:51:30 2006 +0100 Return the correct error code from IConnectionPointContainer::FindConnectionPoint. --- dlls/oleaut32/olefont.c | 4 ++-- dlls/oleaut32/olepicture.c | 4 ++-- dlls/shdocvw/events.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index dfb0d3c..2a121cc 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1901,8 +1901,8 @@ static HRESULT WINAPI OLEFontImpl_FindCo &IID_IConnectionPoint, (LPVOID)ppCp); } else { - FIXME("Tried to find connection point on %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + FIXME("no connection point for %s\n", debugstr_guid(riid)); + return CONNECT_E_NOCONNECTION; } } diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 03de88c..e24fc2a 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -869,8 +869,8 @@ static HRESULT WINAPI OLEPictureImpl_Fin *ppCP = NULL; if (IsEqualGUID(riid,&IID_IPropertyNotifySink)) return IConnectionPoint_QueryInterface(This->pCP,&IID_IConnectionPoint,(LPVOID)ppCP); - FIXME("tried to find connection point on %s?\n",debugstr_guid(riid)); - return 0x80040200; + FIXME("no connection point for %s\n",debugstr_guid(riid)); + return CONNECT_E_NOCONNECTION; } /************************************************************************ * IPersistStream diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c index b7f93b7..f48f066 100644 --- a/dlls/shdocvw/events.c +++ b/dlls/shdocvw/events.c @@ -102,7 +102,7 @@ static HRESULT WINAPI ConnectionPointCon } WARN("Unsupported IID %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + return CONNECT_E_NOCONNECTION; } #undef CONPTCONT_THIS

1 0

Robert Shearman : oleaut: Partially implement Invoke on the standard picture implementation.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: f4acfe9a53c9ba8fb7945fcf47d23d3e011eed2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f4acfe9a53c9ba8fb7945fc… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 10 14:51:03 2006 +0100 oleaut: Partially implement Invoke on the standard picture implementation. --- dlls/oleaut32/olepicture.c | 31 +++++++++++++++++++++++++------ 1 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 3420bdd..03de88c 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2029,12 +2029,31 @@ static HRESULT WINAPI OLEPictureImpl_Inv EXCEPINFO* pExepInfo, UINT* puArgErr) { - FIXME("(dispid: %ld):Stub\n",dispIdMember); - - VariantInit(pVarResult); - V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = FALSE; - return S_OK; + OLEPictureImpl *This = impl_from_IDispatch(iface); + if (dispIdMember == DISPID_PICT_TYPE) + { + TRACE("DISPID_PICT_TYPE\n"); + if (wFlags & ~INVOKE_PROPERTYGET) + return DISP_E_PARAMNOTFOUND; + if (pDispParams->cArgs != 0) + return DISP_E_BADPARAMCOUNT; + if (pVarResult) + { + VariantInit(pVarResult); + V_VT(pVarResult) = VT_I2; + return OLEPictureImpl_get_Type((IPicture *)&This->lpVtbl, &V_I2(pVarResult)); + } + return S_OK; + } + else + { + FIXME("(dispid: %ld):Stub\n",dispIdMember); + + VariantInit(pVarResult); + V_VT(pVarResult) = VT_BOOL; + V_BOOL(pVarResult) = FALSE; + return S_OK; + } }

1 0

Robert Shearman : oleaut: Fix importing the IDispatch interface for TKIND_DISPATCH type infos.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: 265f04280164fbd32cf72d0bc105336568c7046a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=265f04280164fbd32cf72d0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 10 14:50:53 2006 +0100 oleaut: Fix importing the IDispatch interface for TKIND_DISPATCH type infos. Fix importing the IDispatch interface for TKIND_DISPATCH type infos when the offset isn't specified. It should be fetched from the dispatch offset stored in the header, rather than using a hack that doesn't work. --- dlls/oleaut32/typelib.c | 48 ++++++++++++----------------------------------- 1 files changed, 12 insertions(+), 36 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a516fa5..6999dfd 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1964,9 +1964,10 @@ static void MSFT_DoRefType(TLBContext *p (*ppRefType)->pImpTLInfo = pImpLib; if(impinfo.flags & MSFT_IMPINFO_OFFSET_IS_GUID) { MSFT_ReadGuid(&(*ppRefType)->guid, impinfo.oGuid, pcx); + TRACE("importing by guid %s\n", debugstr_guid(&(*ppRefType)->guid)); (*ppRefType)->index = TLB_REF_USE_GUID; } else - (*ppRefType)->index = impinfo.oGuid; + (*ppRefType)->index = impinfo.oGuid; }else{ ERR("Cannot find a reference\n"); (*ppRefType)->reference=-1; @@ -2009,6 +2010,7 @@ static void MSFT_DoImplTypes(TLBContext static ITypeInfoImpl * MSFT_DoTypeInfo( TLBContext *pcx, int count, + INT dispatch_href, ITypeLibImpl * pLibInfo) { MSFT_TypeInfoBase tiBase; @@ -2089,38 +2091,10 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->impltypelist->hRef = tiBase.datatype1; } else - { /* FIXME: This is a really bad hack to add IDispatch */ - const char* szStdOle = "stdole2.tlb\0"; - int nStdOleLen = strlen(szStdOle); - TLBRefType **ppRef = &ptiRet->reflist; - - while(*ppRef) { - if((*ppRef)->reference == -1) - break; - ppRef = &(*ppRef)->next; - } - if(!*ppRef) { - *ppRef = TLB_Alloc(sizeof(**ppRef)); - (*ppRef)->guid = IID_IDispatch; - (*ppRef)->reference = -1; - (*ppRef)->index = TLB_REF_USE_GUID; - (*ppRef)->pImpTLInfo = TLB_Alloc(sizeof(TLBImpLib)); - (*ppRef)->pImpTLInfo->guid = IID_StdOle; - (*ppRef)->pImpTLInfo->name = SysAllocStringLen(NULL, - nStdOleLen + 1); - - MultiByteToWideChar(CP_ACP, - MB_PRECOMPOSED, - szStdOle, - -1, - (*ppRef)->pImpTLInfo->name, - SysStringLen((*ppRef)->pImpTLInfo->name)); - - (*ppRef)->pImpTLInfo->lcid = 0; - (*ppRef)->pImpTLInfo->wVersionMajor = 2; - (*ppRef)->pImpTLInfo->wVersionMinor = 0; - } - } + { + MSFT_DoRefType(pcx, ptiRet, dispatch_href); + ptiRet->impltypelist->hRef = dispatch_href; + } break; default: ptiRet->impltypelist=TLB_Alloc(sizeof(TLBImplType)); @@ -2342,12 +2316,14 @@ static ITypeLib2* ITypeLib2_Constructor_ /* read header */ MSFT_ReadLEDWords((void*)&tlbHeader, sizeof(tlbHeader), &cx, 0); - TRACE("header:\n"); - TRACE("\tmagic1=0x%08x ,magic2=0x%08x\n",tlbHeader.magic1,tlbHeader.magic2 ); + TRACE_(typelib)("header:\n"); + TRACE_(typelib)("\tmagic1=0x%08x ,magic2=0x%08x\n",tlbHeader.magic1,tlbHeader.magic2 ); if (tlbHeader.magic1 != MSFT_SIGNATURE) { FIXME("Header type magic 0x%08x not supported.\n",tlbHeader.magic1); return NULL; } + TRACE_(typelib)("\tdispatchpos = 0x%x\n", tlbHeader.dispatchpos); + /* there is a small amount of information here until the next important * part: * the segment directory . Try to calculate the amount of data */ @@ -2512,7 +2488,7 @@ static ITypeLib2* ITypeLib2_Constructor_ for(i = 0; i<(int)tlbHeader.nrtypeinfos; i++) { - *ppTI = MSFT_DoTypeInfo(&cx, i, pTypeLibImpl); + *ppTI = MSFT_DoTypeInfo(&cx, i, tlbHeader.dispatchpos, pTypeLibImpl); ppTI = &((*ppTI)->next); (pTypeLibImpl->TypeInfoCount)++;

1 0

Robert Shearman : oleaut: Add tests for IFontEventsDisp.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: bcac0cd5d52dcec653f0e15996e6ff9e351d9551 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bcac0cd5d52dcec653f0e15… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 10 14:50:40 2006 +0100 oleaut: Add tests for IFontEventsDisp. --- dlls/oleaut32/tests/olefont.c | 112 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index fb24207..5906749 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -37,11 +37,14 @@ #include <winnt.h> #include <wtypes.h> #include <olectl.h> +#include <ocidl.h> static HMODULE hOleaut32; static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); +#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08lx\n", hr) + /* Create a font with cySize given by lo_size, hi_size, */ /* SetRatio to ratio_logical, ratio_himetric, */ /* check that resulting hfont has height hfont_height. */ @@ -173,6 +176,114 @@ void test_type_info(void) IFontDisp_Release(fontdisp); } +static HRESULT WINAPI FontEventsDisp_QueryInterface( + IFontEventsDisp *iface, + /* [in] */ REFIID riid, + /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) +{ + if (IsEqualIID(riid, &IID_IFontEventsDisp) || IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) + { + IUnknown_AddRef(iface); + *ppvObject = iface; + return S_OK; + } + else + { + *ppvObject = NULL; + return E_NOINTERFACE; + } +} + +static ULONG WINAPI FontEventsDisp_AddRef( + IFontEventsDisp *iface) +{ + return 2; +} + +static ULONG WINAPI FontEventsDisp_Release( + IFontEventsDisp *iface) +{ + return 1; +} + +static BOOL fonteventsdisp_invoke_called = FALSE; + +static HRESULT WINAPI FontEventsDisp_Invoke( + IFontEventsDisp __RPC_FAR * iface, + /* [in] */ DISPID dispIdMember, + /* [in] */ REFIID riid, + /* [in] */ LCID lcid, + /* [in] */ WORD wFlags, + /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams, + /* [out] */ VARIANT __RPC_FAR *pVarResult, + /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo, + /* [out] */ UINT __RPC_FAR *puArgErr) +{ + static const WCHAR wszBold[] = {'B','o','l','d',0}; + ok(wFlags == INVOKE_FUNC, "invoke flags should have been INVOKE_FUNC instead of 0x%x\n", wFlags); + ok(dispIdMember == DISPID_FONT_CHANGED, "dispIdMember should have been DISPID_FONT_CHANGED instead of 0x%lx\n", dispIdMember); + ok(pDispParams->cArgs == 1, "pDispParams->cArgs should have been 1 instead of %d\n", pDispParams->cArgs); + ok(V_VT(&pDispParams->rgvarg[0]) == VT_BSTR, "VT of first param should have been VT_BSTR instead of %d\n", V_VT(&pDispParams->rgvarg[0])); + ok(!lstrcmpW(V_BSTR(&pDispParams->rgvarg[0]), wszBold), "String in first param should have been \"Bold\"\n"); + + fonteventsdisp_invoke_called = TRUE; + return S_OK; +} + +static IFontEventsDispVtbl FontEventsDisp_Vtbl = +{ + FontEventsDisp_QueryInterface, + FontEventsDisp_AddRef, + FontEventsDisp_Release, + NULL, + NULL, + NULL, + FontEventsDisp_Invoke +}; + +static IFontEventsDisp FontEventsDisp = { &FontEventsDisp_Vtbl }; + +static void test_font_events_disp(void) +{ + IFont *pFont; + IConnectionPointContainer *pCPC; + IConnectionPoint *pCP; + FONTDESC fontdesc; + HRESULT hr; + DWORD dwCookie; + static const WCHAR wszMSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f',0}; + + fontdesc.cbSizeofstruct = sizeof(fontdesc); + fontdesc.lpstrName = (LPOLESTR)wszMSSansSerif; + fontdesc.cySize.int64 = 12 * 10000; /* 12 pt */ + fontdesc.sWeight = FW_NORMAL; + fontdesc.sCharset = 0; + fontdesc.fItalic = FALSE; + fontdesc.fUnderline = FALSE; + fontdesc.fStrikethrough = FALSE; + + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void **)&pFont); + ok_ole_success(hr, "OleCreateFontIndirect"); + + hr = IFont_QueryInterface(pFont, &IID_IConnectionPointContainer, (void **)&pCPC); + ok_ole_success(hr, "IFont_QueryInterface"); + + hr = IConnectionPointContainer_FindConnectionPoint(pCPC, &IID_IFontEventsDisp, &pCP); + ok_ole_success(hr, "IConnectionPointContainer_FindConnectionPoint"); + IConnectionPointContainer_Release(pCPC); + + hr = IConnectionPoint_Advise(pCP, (IUnknown *)&FontEventsDisp, &dwCookie); + ok_ole_success(hr, "IConnectionPoint_Advise"); + IConnectionPoint_Release(pCP); + + hr = IFont_put_Bold(pFont, TRUE); + ok_ole_success(hr, "IFont_put_Bold"); + + ok(fonteventsdisp_invoke_called, "IFontEventDisp::Invoke wasn't called\n"); + + IFont_Release(pFont); +} + START_TEST(olefont) { hOleaut32 = LoadLibraryA("oleaut32.dll"); @@ -193,4 +304,5 @@ START_TEST(olefont) /* test_ifont_sizes(0, 0, 72, 2540, 0, "zero size"); */ /* zero size */ /* test_ifont_sizes(186000, 0, 72, 2540, -19, "rounding"); */ /* test rounding */ + test_font_events_disp(); }

1 0

Robert Shearman : oleaut: Implement IFontEventsDisp connection point for the standard
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: d49e808be01c827e1394709839c82d6a4656979a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d49e808be01c827e1394709… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 10 14:50:26 2006 +0100 oleaut: Implement IFontEventsDisp connection point for the standard font implementation. --- dlls/oleaut32/olefont.c | 94 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 76 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index d2154d4..dfb0d3c 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -40,6 +40,7 @@ #include "olectl.h" #include "wine/debug.h" #include "connpt.h" /* for CreateConnectionPoint */ +#include "oaidl.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -95,7 +96,8 @@ struct OLEFontImpl long cyLogical; long cyHimetric; - IConnectionPoint *pCP; + IConnectionPoint *pPropertyNotifyCP; + IConnectionPoint *pFontEventsCP; }; /* @@ -378,24 +380,74 @@ HRESULT WINAPI OleCreateFontIndirect( */ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) { + static const WCHAR wszName[] = {'N','a','m','e',0}; + static const WCHAR wszSize[] = {'S','i','z','e',0}; + static const WCHAR wszBold[] = {'B','o','l','d',0}; + static const WCHAR wszItalic[] = {'I','t','a','l','i','c',0}; + static const WCHAR wszUnder[] = {'U','n','d','e','r','l','i','n','e',0}; + static const WCHAR wszStrike[] = {'S','t','r','i','k','e','t','h','r','o','u','g','h',0}; + static const WCHAR wszWeight[] = {'W','e','i','g','h','t',0}; + static const WCHAR wszCharset[] = {'C','h','a','r','s','s','e','t',0}; + static const LPCWSTR dispid_mapping[] = + { + wszName, + NULL, + wszSize, + wszBold, + wszItalic, + wszUnder, + wszStrike, + wszWeight, + wszCharset + }; + IEnumConnections *pEnum; CONNECTDATA CD; HRESULT hres; - hres = IConnectionPoint_EnumConnections(this->pCP, &pEnum); - if (FAILED(hres)) /* When we have 0 connections. */ - return; - - while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { - IPropertyNotifySink *sink; - - IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (LPVOID)&sink); - IPropertyNotifySink_OnChanged(sink, dispID); - IPropertyNotifySink_Release(sink); - IUnknown_Release(CD.pUnk); + hres = IConnectionPoint_EnumConnections(this->pPropertyNotifyCP, &pEnum); + if (SUCCEEDED(hres)) + { + while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { + IPropertyNotifySink *sink; + + IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (LPVOID)&sink); + IPropertyNotifySink_OnChanged(sink, dispID); + IPropertyNotifySink_Release(sink); + IUnknown_Release(CD.pUnk); + } + IEnumConnections_Release(pEnum); + } + + hres = IConnectionPoint_EnumConnections(this->pFontEventsCP, &pEnum); + if (SUCCEEDED(hres)) + { + DISPPARAMS dispparams; + VARIANTARG vararg; + + VariantInit(&vararg); + V_VT(&vararg) = VT_BSTR; + V_BSTR(&vararg) = SysAllocString(dispid_mapping[dispID]); + + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &vararg; + + while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { + IFontEventsDisp *disp; + + IUnknown_QueryInterface(CD.pUnk, &IID_IFontEventsDisp, (LPVOID)&disp); + IDispatch_Invoke(disp, DISPID_FONT_CHANGED, &IID_NULL, + LOCALE_NEUTRAL, INVOKE_FUNC, &dispparams, NULL, + NULL, NULL); + + IDispatch_Release(disp); + IUnknown_Release(CD.pUnk); + } + VariantClear(&vararg); + IEnumConnections_Release(pEnum); } - IEnumConnections_Release(pEnum); - return; } /************************************************************************ @@ -459,7 +511,8 @@ static OLEFontImpl* OLEFontImpl_Construc newObject->fontLock = 0; newObject->cyLogical = 72L; newObject->cyHimetric = 2540L; - CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pCP); + CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); + CreateConnectionPoint((IUnknown*)newObject, &IID_IFontEventsDisp, &newObject->pFontEventsCP); TRACE("returning %p\n", newObject); return newObject; } @@ -1839,9 +1892,14 @@ static HRESULT WINAPI OLEFontImpl_FindCo OLEFontImpl *this = impl_from_IConnectionPointContainer(iface); TRACE("(%p)->(%s, %p): stub\n", this, debugstr_guid(riid), ppCp); - if(memcmp(riid, &IID_IPropertyNotifySink, sizeof(IID_IPropertyNotifySink)) == 0) { - return IConnectionPoint_QueryInterface(this->pCP, &IID_IConnectionPoint, - (LPVOID)ppCp); + if(IsEqualIID(riid, &IID_IPropertyNotifySink)) { + return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP, + &IID_IConnectionPoint, + (LPVOID)ppCp); + } else if(IsEqualIID(riid, &IID_IFontEventsDisp)) { + return IConnectionPoint_QueryInterface(this->pFontEventsCP, + &IID_IConnectionPoint, + (LPVOID)ppCp); } else { FIXME("Tried to find connection point on %s\n", debugstr_guid(riid)); return E_NOINTERFACE;

1 0

Robert Shearman : include: Define DISPID_FONT_CHANGED.
by Alexandre Julliard 10 Feb '06

10 Feb '06

Module: wine Branch: refs/heads/master Commit: c548b7e3d15a819136f56c4505794472182ef40a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c548b7e3d15a819136f56c4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 10 14:50:11 2006 +0100 include: Define DISPID_FONT_CHANGED. --- include/olectl.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/olectl.h b/include/olectl.h index 53818f0..37a9b9a 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -360,6 +360,7 @@ HRESULT WINAPI OleTranslateColor( OLE_CO #define DISPID_FONT_STRIKE 6 #define DISPID_FONT_WEIGHT 7 #define DISPID_FONT_CHARSET 8 +#define DISPID_FONT_CHANGED 9 /* IPicture */ #define DISPID_PICT_HANDLE 0

1 0