March 2009 - Wine-commits - list.winehq.org

Huw Davies : ole32: Use a helper function to access the enum format implementation.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: d93688a721ea2ff0105233893f7d79b2d5b1093d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93688a721ea2ff0105233893… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 15:42:13 2009 +0000 ole32: Use a helper function to access the enum format implementation. --- dlls/ole32/clipboard.c | 75 +++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 42 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 5dbcca8..a571412 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -105,32 +105,6 @@ static inline ole_clipbrd *impl_from_IDataObject(IDataObject *iface) return (ole_clipbrd*)((char*)iface - FIELD_OFFSET(ole_clipbrd, lpvtbl)); } -/**************************************************************************** -* IEnumFORMATETC implementation -* DO NOT add any members before the VTables declaration! -*/ -typedef struct -{ - /* IEnumFORMATETC VTable */ - const IEnumFORMATETCVtbl *lpVtbl; - - /* IEnumFORMATETC fields */ - UINT posFmt; /* current enumerator position */ - UINT countFmt; /* number of EnumFORMATETC's in array */ - LPFORMATETC pFmt; /* array of EnumFORMATETC's */ - - /* - * Reference count of this object - */ - LONG ref; - - /* - * IUnknown implementation of the parent data object. - */ - IUnknown* pUnkDataObj; - -} IEnumFORMATETCImpl; - typedef struct PresentationDataHeader { BYTE unknown1[28]; @@ -177,6 +151,28 @@ typedef struct * the OLE clipboard's IDataObject. *---------------------------------------------------------------------*/ +typedef struct enum_fmtetc +{ + const IEnumFORMATETCVtbl *lpVtbl; + LONG ref; + + UINT posFmt; /* current enumerator position */ + UINT countFmt; /* number of EnumFORMATETC's in array */ + LPFORMATETC pFmt; /* array of EnumFORMATETC's */ + + + /* + * IUnknown implementation of the parent data object. + */ + IUnknown* pUnkDataObj; + +} enum_fmtetc; + +static inline enum_fmtetc *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) +{ + return (enum_fmtetc*)((char*)iface - FIELD_OFFSET(enum_fmtetc, lpVtbl)); +} + /************************************************************************ * OLEClipbrd_IEnumFORMATETC_QueryInterface (IUnknown) * @@ -185,21 +181,16 @@ typedef struct static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface (LPENUMFORMATETC iface, REFIID riid, LPVOID* ppvObj) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); - TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); - - /* - * Since enumerators are separate objects from the parent data object - * we only need to support the IUnknown and IEnumFORMATETC interfaces - */ + TRACE("(%p)->(IID: %s, %p)\n", This, debugstr_guid(riid), ppvObj); *ppvObj = NULL; if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumFORMATETC)) { - *ppvObj = This; + *ppvObj = iface; } if(*ppvObj) @@ -224,7 +215,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface */ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(count=%u)\n",This, This->ref); if (This->pUnkDataObj) @@ -240,7 +231,7 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) */ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); ULONG ref; TRACE("(%p)->(count=%u)\n",This, This->ref); @@ -266,7 +257,7 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface) static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next (LPENUMFORMATETC iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFethed) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); UINT cfetch; HRESULT hres = S_FALSE; @@ -304,7 +295,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next */ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULONG celt) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(num=%u)\n", This, celt); This->posFmt += celt; @@ -323,7 +314,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULON */ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->()\n", This); This->posFmt = 0; @@ -341,7 +332,7 @@ static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORM static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone (LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); HRESULT hr = S_OK; TRACE("(%p)->(ppenum=%p)\n", This, ppenum); @@ -381,10 +372,10 @@ static const IEnumFORMATETCVtbl efvt = static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[], LPUNKNOWN pUnkDataObj) { - IEnumFORMATETCImpl* ef; + enum_fmtetc* ef; DWORD size=cfmt * sizeof(FORMATETC); - ef = HeapAlloc(GetProcessHeap(), 0, sizeof(IEnumFORMATETCImpl)); + ef = HeapAlloc(GetProcessHeap(), 0, sizeof(*ef)); if (!ef) return NULL;

1 0

Huw Davies : ole32: Rename a variable.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 1213964330f87c8d6fc315ac7034990bdf8673c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1213964330f87c8d6fc315ac7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 16:20:18 2009 +0000 ole32: Rename a variable. --- dlls/ole32/clipboard.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index a571412..6da8c34 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -156,7 +156,7 @@ typedef struct enum_fmtetc const IEnumFORMATETCVtbl *lpVtbl; LONG ref; - UINT posFmt; /* current enumerator position */ + UINT pos; /* current enumerator position */ UINT countFmt; /* number of EnumFORMATETC's in array */ LPFORMATETC pFmt; /* array of EnumFORMATETC's */ @@ -261,19 +261,19 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next UINT cfetch; HRESULT hres = S_FALSE; - TRACE("(%p)->(pos=%u)\n", This, This->posFmt); + TRACE("(%p)->(pos=%u)\n", This, This->pos); - if (This->posFmt < This->countFmt) + if (This->pos < This->countFmt) { - cfetch = This->countFmt - This->posFmt; + cfetch = This->countFmt - This->pos; if (cfetch >= celt) { cfetch = celt; hres = S_OK; } - memcpy(rgelt, &This->pFmt[This->posFmt], cfetch * sizeof(FORMATETC)); - This->posFmt += cfetch; + memcpy(rgelt, &This->pFmt[This->pos], cfetch * sizeof(FORMATETC)); + This->pos += cfetch; } else { @@ -298,10 +298,10 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULON enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(num=%u)\n", This, celt); - This->posFmt += celt; - if (This->posFmt > This->countFmt) + This->pos += celt; + if (This->pos > This->countFmt) { - This->posFmt = This->countFmt; + This->pos = This->countFmt; return S_FALSE; } return S_OK; @@ -317,7 +317,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->()\n", This); - This->posFmt = 0; + This->pos = 0; return S_OK; } @@ -344,6 +344,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone This->pFmt, This->pUnkDataObj); + /* FIXME: This is wrong! */ if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenum))) return ( hr ); @@ -383,7 +384,7 @@ static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORM ef->lpVtbl = &efvt; ef->pUnkDataObj = pUnkDataObj; - ef->posFmt = 0; + ef->pos = 0; ef->countFmt = cfmt; ef->pFmt = HeapAlloc(GetProcessHeap(), 0, size); if (ef->pFmt)

1 0

Huw Davies : ole32: Don't hold a reference on the parent IDataObject.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 1cc023c53afc2ec468b3b52a9d9b7caa93178ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc023c53afc2ec468b3b52a9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 16:25:37 2009 +0000 ole32: Don't hold a reference on the parent IDataObject. --- dlls/ole32/clipboard.c | 34 ++++++---------------------------- 1 files changed, 6 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 6da8c34..f973d2e 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -159,13 +159,6 @@ typedef struct enum_fmtetc UINT pos; /* current enumerator position */ UINT countFmt; /* number of EnumFORMATETC's in array */ LPFORMATETC pFmt; /* array of EnumFORMATETC's */ - - - /* - * IUnknown implementation of the parent data object. - */ - IUnknown* pUnkDataObj; - } enum_fmtetc; static inline enum_fmtetc *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) @@ -207,20 +200,12 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface /************************************************************************ * OLEClipbrd_IEnumFORMATETC_AddRef (IUnknown) * - * Since enumerating formats only makes sense when our data object is around, - * we insure that it stays as long as we stay by calling our parents IUnknown - * for AddRef and Release. But since we are not controlled by the lifetime of - * the outer object, we still keep our own reference count in order to - * free ourselves. */ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) { enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(count=%u)\n",This, This->ref); - if (This->pUnkDataObj) - IUnknown_AddRef(This->pUnkDataObj); - return InterlockedIncrement(&This->ref); } @@ -236,9 +221,6 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface) TRACE("(%p)->(count=%u)\n",This, This->ref); - if (This->pUnkDataObj) - IUnknown_Release(This->pUnkDataObj); /* Release parent data object */ - ref = InterlockedDecrement(&This->ref); if (!ref) { @@ -321,8 +303,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) return S_OK; } -static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[], - LPUNKNOWN pUnkDataObj); +static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[]); /************************************************************************ * OLEClipbrd_IEnumFORMATETC_Clone (IEnumFORMATETC) @@ -341,8 +322,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone return E_INVALIDARG; *ppenum = OLEClipbrd_IEnumFORMATETC_Construct(This->countFmt, - This->pFmt, - This->pUnkDataObj); + This->pFmt); /* FIXME: This is wrong! */ if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenum))) @@ -363,15 +343,14 @@ static const IEnumFORMATETCVtbl efvt = }; /************************************************************************ - * OLEClipbrd_IEnumFORMATETC_Construct (UINT, const FORMATETC, LPUNKNOWN) + * OLEClipbrd_IEnumFORMATETC_Construct * * Creates an IEnumFORMATETC enumerator from an array of FORMATETC - * Structures. pUnkOuter is the outer unknown for reference counting only. + * Structures. * NOTE: this does not AddRef the interface. */ -static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[], - LPUNKNOWN pUnkDataObj) +static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[]) { enum_fmtetc* ef; DWORD size=cfmt * sizeof(FORMATETC); @@ -382,7 +361,6 @@ static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORM ef->ref = 0; ef->lpVtbl = &efvt; - ef->pUnkDataObj = pUnkDataObj; ef->pos = 0; ef->countFmt = cfmt; @@ -1068,7 +1046,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc( * Create an EnumFORMATETC enumerator and return an * EnumFORMATETC after bumping up its ref count */ - *ppenumFormatEtc = OLEClipbrd_IEnumFORMATETC_Construct( cfmt, afmt, (LPUNKNOWN)iface); + *ppenumFormatEtc = OLEClipbrd_IEnumFORMATETC_Construct( cfmt, afmt ); if (!(*ppenumFormatEtc)) HANDLE_ERROR( E_OUTOFMEMORY );

1 0

Huw Davies : ole32: Change the enum formatetc constructor to return HRESULT .
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 25f1b058a8f8440bd7f9387590ffa49fcbb92c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f1b058a8f8440bd7f938759… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 16:38:57 2009 +0000 ole32: Change the enum formatetc constructor to return HRESULT. --- dlls/ole32/clipboard.c | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index f973d2e..7d1bb26 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -303,7 +303,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) return S_OK; } -static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[]); +static HRESULT enum_fmtetc_construct(UINT cfmt, const FORMATETC afmt[], IEnumFORMATETC **obj); /************************************************************************ * OLEClipbrd_IEnumFORMATETC_Clone (IEnumFORMATETC) @@ -321,8 +321,8 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone if ( !ppenum ) return E_INVALIDARG; - *ppenum = OLEClipbrd_IEnumFORMATETC_Construct(This->countFmt, - This->pFmt); + hr = enum_fmtetc_construct(This->countFmt, This->pFmt, ppenum); + if (FAILED(hr)) return hr; /* FIXME: This is wrong! */ if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenum))) @@ -343,21 +343,20 @@ static const IEnumFORMATETCVtbl efvt = }; /************************************************************************ - * OLEClipbrd_IEnumFORMATETC_Construct + * enum_fmtetc_construct * * Creates an IEnumFORMATETC enumerator from an array of FORMATETC * Structures. * NOTE: this does not AddRef the interface. */ - -static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[]) +static HRESULT enum_fmtetc_construct(UINT cfmt, const FORMATETC afmt[], IEnumFORMATETC **obj) { enum_fmtetc* ef; DWORD size=cfmt * sizeof(FORMATETC); + *obj = NULL; ef = HeapAlloc(GetProcessHeap(), 0, sizeof(*ef)); - if (!ef) - return NULL; + if (!ef) return E_OUTOFMEMORY; ef->ref = 0; ef->lpVtbl = &efvt; @@ -370,11 +369,12 @@ static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORM else { HeapFree(GetProcessHeap(), 0, ef); - return NULL; + return E_OUTOFMEMORY; } TRACE("(%p)->()\n",ef); - return (LPENUMFORMATETC)ef; + *obj = (IEnumFORMATETC *)ef; + return S_OK; } /*********************************************************************** @@ -1042,14 +1042,11 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc( afmt[i].tymed = TYMED_HGLOBAL; } - /* - * Create an EnumFORMATETC enumerator and return an - * EnumFORMATETC after bumping up its ref count - */ - *ppenumFormatEtc = OLEClipbrd_IEnumFORMATETC_Construct( cfmt, afmt ); - if (!(*ppenumFormatEtc)) - HANDLE_ERROR( E_OUTOFMEMORY ); + hr = enum_fmtetc_construct( cfmt, afmt, ppenumFormatEtc ); + if (FAILED(hr)) + HANDLE_ERROR( hr ); + /* FIXME: This is wrong! */ if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenumFormatEtc))) HANDLE_ERROR( hr );

1 0

Jacek Caban : urlmon: Added IInternetPriority handling tests.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: b83fd688a2a9f076bea194e263d945556ec5a9a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83fd688a2a9f076bea194e26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:30:42 2009 +0200 urlmon: Added IInternetPriority handling tests. --- dlls/urlmon/tests/url.c | 80 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index a855e1b..843b38b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -128,6 +128,7 @@ DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(Load); DEFINE_EXPECT(PutProperty_MIMETYPEPROP); DEFINE_EXPECT(PutProperty_CLASSIDPROP); +DEFINE_EXPECT(SetPriority); static const WCHAR TEST_URL_1[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','\0'}; static const WCHAR TEST_PART_URL_1[] = {'/','t','e','s','t','/','\0'}; @@ -223,6 +224,11 @@ static const char *debugstr_guid(REFIID riid) return buf; } +static BOOL is_urlmon_protocol(int prot) +{ + return prot == FILE_TEST || prot == HTTP_TEST || prot == HTTPS_TEST || prot == FTP_TEST || prot == MK_TEST; +} + static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) { HRESULT hr; @@ -244,14 +250,66 @@ static void test_create(void) test_CreateURLMoniker(TEST_URL_1, TEST_PART_URL_1); } +static HRESULT WINAPI Priority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI Priority_AddRef(IInternetPriority *iface) +{ + return 2; +} + +static ULONG WINAPI Priority_Release(IInternetPriority *iface) +{ + return 1; +} + +static HRESULT WINAPI Priority_SetPriority(IInternetPriority *iface, LONG nPriority) +{ + CHECK_EXPECT(SetPriority); + ok(!nPriority, "nPriority = %d\n", nPriority); + return S_OK; +} + +static HRESULT WINAPI Priority_GetPriority(IInternetPriority *iface, LONG *pnPriority) +{ + ok(0, "unexpected call\n"); + return S_OK; +} + +static const IInternetPriorityVtbl InternetPriorityVtbl = { + Priority_QueryInterface, + Priority_AddRef, + Priority_Release, + Priority_SetPriority, + Priority_GetPriority +}; + +static IInternetPriority InternetPriority = { &InternetPriorityVtbl }; + static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { + *ppv = NULL; + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocol, riid)) { *ppv = iface; return S_OK; } - *ppv = NULL; + if(IsEqualGUID(&IID_IInternetPriority, riid)) { + if(!is_urlmon_protocol(test_protocol)) + return E_NOINTERFACE; + + *ppv = &InternetPriority; + return S_OK; + } + + if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) + return E_NOINTERFACE; /* TODO */ + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -413,9 +471,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, if(filedwl_api) { ok(bindf == (BINDF_PULLDATA|BINDF_FROMURLMON|BINDF_NEEDFILE), "bindf=%08x\n", bindf); - }else if(tymed == TYMED_ISTREAM - && (test_protocol == FILE_TEST || test_protocol == MK_TEST - || test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST)) { + }else if(tymed == TYMED_ISTREAM && is_urlmon_protocol(test_protocol)) { ok(bindf == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA |BINDF_FROMURLMON), "bindf=%08x\n", bindf); @@ -2072,6 +2128,8 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t) SET_EXPECT(QueryService_IInternetProtocol); SET_EXPECT(OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + SET_EXPECT(SetPriority); SET_EXPECT(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) SET_EXPECT(Terminate); @@ -2143,6 +2201,8 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t) CHECK_CALLED(QueryService_IInternetProtocol); CHECK_CALLED(OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + CHECK_CALLED(SetPriority); CHECK_CALLED(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) { if(tymed == TYMED_FILE) @@ -2242,6 +2302,8 @@ static void test_BindToObject(int protocol, BOOL emul) SET_EXPECT(QueryService_IInternetProtocol); SET_EXPECT(Obj_OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + SET_EXPECT(SetPriority); SET_EXPECT(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) SET_EXPECT(Terminate); @@ -2311,6 +2373,8 @@ static void test_BindToObject(int protocol, BOOL emul) CHECK_CALLED(QueryService_IInternetProtocol); CHECK_CALLED(Obj_OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + CHECK_CALLED(SetPriority); CHECK_CALLED(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) CHECK_CALLED(Terminate); @@ -2391,6 +2455,8 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) } SET_EXPECT(OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + SET_EXPECT(SetPriority); SET_EXPECT(Start); SET_EXPECT(UnlockRequest); }else { @@ -2425,6 +2491,8 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) } CHECK_CALLED(OnStartBinding); if(emulate_protocol) { + if(is_urlmon_protocol(test_protocol)) + CHECK_CALLED(SetPriority); CHECK_CALLED(Start); CHECK_CALLED(UnlockRequest); }else { @@ -2524,6 +2592,8 @@ static void test_ReportResult(HRESULT exhres) SET_EXPECT(GetBindInfo); SET_EXPECT(QueryInterface_IInternetProtocol); SET_EXPECT(OnStartBinding); + if(is_urlmon_protocol(test_protocol)) + SET_EXPECT(SetPriority); SET_EXPECT(Start); hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); @@ -2536,6 +2606,8 @@ static void test_ReportResult(HRESULT exhres) CHECK_CALLED(GetBindInfo); CHECK_CALLED(QueryInterface_IInternetProtocol); CHECK_CALLED(OnStartBinding); + if(is_urlmon_protocol(test_protocol)) + CHECK_CALLED(SetPriority); CHECK_CALLED(Start); ok(unk == NULL, "unk=%p\n", unk);

1 0

Jacek Caban : urlmon: Added IWinInetHttpInfo stub implementation to FtpProtocol object.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: c31e6537fbb287ed8953849caf9ebd189188c5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31e6537fbb287ed8953849ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:30:50 2009 +0200 urlmon: Added IWinInetHttpInfo stub implementation to FtpProtocol object. --- dlls/urlmon/ftp.c | 59 ++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/tests/protocol.c | 1 + 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index dbdd7a7..75c21f2 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -26,12 +26,14 @@ typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; + const IWinInetHttpInfoVtbl *lpWinInetHttpInfoVtbl; LONG ref; } FtpProtocol; -#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) -#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define INETHTTPINFO(x) ((IWinInetHttpInfo*) &(x)->lpWinInetHttpInfoVtbl) #define ASYNCPROTOCOL_THIS(iface) DEFINE_THIS2(FtpProtocol, base, iface) @@ -97,6 +99,12 @@ static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocol *iface, REFII }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); *ppv = PRIORITY(This); + }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { + TRACE("(%p)->(IID_IWinInetInfo %p)\n", This, ppv); + *ppv = INETHTTPINFO(This); + }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { + TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); + *ppv = INETHTTPINFO(This); } if(*ppv) { @@ -295,6 +303,52 @@ static const IInternetPriorityVtbl FtpPriorityVtbl = { FtpPriority_GetPriority }; +#define INETINFO_THIS(iface) DEFINE_THIS(FtpProtocol, WinInetHttpInfo, iface) + +static HRESULT WINAPI HttpInfo_QueryInterface(IWinInetHttpInfo *iface, REFIID riid, void **ppv) +{ + FtpProtocol *This = INETINFO_THIS(iface); + return IBinding_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI HttpInfo_AddRef(IWinInetHttpInfo *iface) +{ + FtpProtocol *This = INETINFO_THIS(iface); + return IBinding_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI HttpInfo_Release(IWinInetHttpInfo *iface) +{ + FtpProtocol *This = INETINFO_THIS(iface); + return IBinding_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer) +{ + FtpProtocol *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) +{ + FtpProtocol *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + return E_NOTIMPL; +} + +#undef INETINFO_THIS + +static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { + HttpInfo_QueryInterface, + HttpInfo_AddRef, + HttpInfo_Release, + HttpInfo_QueryOption, + HttpInfo_QueryInfo +}; + HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { FtpProtocol *ret; @@ -308,6 +362,7 @@ HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret->base.vtbl = &AsyncProtocolVtbl; ret->lpInternetProtocolVtbl = &FtpProtocolVtbl; ret->lpInternetPriorityVtbl = &FtpPriorityVtbl; + ret->lpWinInetHttpInfoVtbl = &WinInetHttpInfoVtbl; ret->ref = 1; *ppobj = PROTOCOL(ret); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index d37e152..9a488c0 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1814,6 +1814,7 @@ static void test_ftp_protocol(void) ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); test_priority(async_protocol); + test_http_info(async_protocol); SET_EXPECT(GetBindInfo); SET_EXPECT(GetBindString_USER_AGENT);

1 0

Jacek Caban : urlmon: Added IWinInetHttpInfo support to Binding object.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 67d2fdc34a894c9d48b21a6ea3c72fb3612b93da URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d2fdc34a894c9d48b21a6ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:31:15 2009 +0200 urlmon: Added IWinInetHttpInfo support to Binding object. --- dlls/urlmon/binding.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/bindprot.c | 16 +++++++++- dlls/urlmon/session.c | 6 +++- dlls/urlmon/tests/url.c | 18 +++++++++++ dlls/urlmon/urlmon_main.h | 5 ++- 5 files changed, 115 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67d2fdc34a894c9d48b21…

1 0

Jacek Caban : urlmon: Get rid of ICOM_THIS_MULTI macro.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 74e0072dfd28eabc3a61c1c63973cd1927134936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e0072dfd28eabc3a61c1c63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:31:27 2009 +0200 urlmon: Get rid of ICOM_THIS_MULTI macro. --- dlls/urlmon/format.c | 18 ++++++++++-------- dlls/urlmon/urlmon_main.h | 1 - 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/format.c b/dlls/urlmon/format.c index 0c87ca5..bf9dda0 100644 --- a/dlls/urlmon/format.c +++ b/dlls/urlmon/format.c @@ -35,11 +35,13 @@ typedef struct { static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmtetc, UINT it); -#define ENUMF_THIS(iface) ICOM_THIS_MULTI(EnumFORMATETC, lpEnumFORMATETCVtbl, iface) +#define ENUMF_THIS(iface) DEFINE_THIS(EnumFORMATETC, EnumFORMATETC, iface) static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, REFIID riid, void **ppv) { - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + EnumFORMATETC *This = ENUMF_THIS(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -55,7 +57,7 @@ static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, REFIID static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; @@ -63,7 +65,7 @@ static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface) static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -81,7 +83,7 @@ static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface) static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); ULONG cnt; TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched); @@ -108,7 +110,7 @@ static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt, static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); TRACE("(%p)->(%d)\n", This, celt); @@ -118,7 +120,7 @@ static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); TRACE("(%p)\n", This); @@ -128,7 +130,7 @@ static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface) static HRESULT WINAPI EnumFORMATETC_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); TRACE("(%p)->(%p)\n", This, ppenum); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 637e58e..0d9a966 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -53,7 +53,6 @@ extern LONG URLMON_refCount; static inline void URLMON_LockModule(void) { InterlockedIncrement( &URLMON_refCount ); } static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_refCount ); } -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) #define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) #define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface)

1 0

Roderick Colenbrander : wined3d: Check for the presence of wglGetExtensionsStringARB.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 5d08f3b7051c5b09eedff2ca4365faccc02ce8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d08f3b7051c5b09eedff2ca4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Mar 29 22:08:42 2009 +0200 wined3d: Check for the presence of wglGetExtensionsStringARB. --- dlls/wined3d/directx.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aee4efe..3294fff 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1405,12 +1405,14 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { /* Make sure there's an active HDC else the WGL extensions will fail */ hdc = pwglGetCurrentDC(); if (hdc) { - WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); - TRACE_(d3d_caps)("WGL_Extensions reported:\n"); + /* Not all GL drivers might offer WGL extensions e.g. VirtualBox */ + if(GL_EXTCALL(wglGetExtensionsStringARB)) + WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); if (NULL == WGL_Extensions) { ERR(" WGL_Extensions returns NULL\n"); } else { + TRACE_(d3d_caps)("WGL_Extensions reported:\n"); while (*WGL_Extensions != 0x00) { const char *Start; char ThisExtn[256];

1 0

Ge van Geldorp : urlmon/tests: Fix ftp protocol test on WinXP and higher.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 6d238a6f5178fd470fd04a5a0f09bb1636de0ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d238a6f5178fd470fd04a5a0… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Mar 30 00:41:54 2009 +0200 urlmon/tests: Fix ftp protocol test on WinXP and higher. --- dlls/urlmon/tests/protocol.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 9a488c0..c87c7fb 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -352,7 +352,10 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL { HRESULT hres; - CHECK_EXPECT(Switch); + if(tested_protocol == FTP_TEST) + CHECK_EXPECT2(Switch); + else + CHECK_EXPECT(Switch); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); pdata = pProtocolData; @@ -1835,23 +1838,19 @@ static void test_ftp_protocol(void) (hres == S_OK && cb==1), "Read failed: %08x (%d bytes)\n", hres, cb); WaitForSingleObject(event_complete, INFINITE); - CHECK_CALLED(Switch); while(1) { - SET_EXPECT(Switch); hres = IInternetProtocol_Read(async_protocol, buf, sizeof(buf), &cb); - if(hres == E_PENDING) { + if(hres == E_PENDING) WaitForSingleObject(event_complete, INFINITE); - CHECK_CALLED(Switch); - }else { - CHECK_NOT_CALLED(Switch); + else if(cb == 0) break; - } } ok(hres == S_FALSE, "Read failed: %08x\n", hres); CHECK_CALLED(ReportResult); + CHECK_CALLED(Switch); test_protocol_terminate(async_protocol);

1 0