March 2013 - Wine-Commits - list.winehq.org

Michael Stefaniuc : avifil32: Support COM aggregation for AVIFile.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 7854cce7575735cd06d0ef340015ef95831d47f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7854cce7575735cd06d0ef340… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 7 00:45:08 2013 +0100 avifil32: Support COM aggregation for AVIFile. Ref counting bug in QueryInterface comes free of charge! --- dlls/avifil32/avifile.c | 118 ++++++++++++++++++++++++++------------- dlls/avifil32/avifile_private.h | 2 +- dlls/avifil32/factory.c | 13 +++- 3 files changed, 91 insertions(+), 42 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 408808c..ab60c3a 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -30,6 +30,7 @@ * When index is missing it works, but index seems to be okay. */ +#define COBJMACROS #include <assert.h> #include <stdarg.h> @@ -118,8 +119,10 @@ typedef struct _IAVIStreamImpl { } IAVIStreamImpl; struct _IAVIFileImpl { + IUnknown IUnknown_inner; IAVIFile IAVIFile_iface; IPersistFile IPersistFile_iface; + IUnknown *outer_unk; LONG ref; AVIFILEINFOW fInfo; @@ -144,6 +147,11 @@ struct _IAVIFileImpl { BOOL fDirty; }; +static inline IAVIFileImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, IAVIFileImpl, IUnknown_inner); +} + static inline IAVIFileImpl *impl_from_IAVIFile(IAVIFile *iface) { return CONTAINING_RECORD(iface, IAVIFileImpl, IAVIFile_iface); @@ -180,32 +188,37 @@ static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size); -static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, - LPVOID *obj) +static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - IAVIFileImpl *This = impl_from_IAVIFile(iface); - - TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); + IAVIFileImpl *This = impl_from_IUnknown(iface); - if (IsEqualGUID(&IID_IUnknown, refiid) || - IsEqualGUID(&IID_IAVIFile, refiid)) { - *obj = iface; - IAVIFile_AddRef(iface); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); - return S_OK; - } else if (IsEqualGUID(&IID_IPersistFile, refiid)) { - *obj = &This->IPersistFile_iface; - IAVIFile_AddRef(iface); + if (!ppv) { + WARN("invalid parameter\n"); + return E_INVALIDARG; + } + *ppv = NULL; - return S_OK; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_inner; + else if (IsEqualIID(riid, &IID_IAVIFile)) + *ppv = &This->IAVIFile_iface; + else if (IsEqualGUID(riid, &IID_IPersistFile)) + *ppv = &This->IPersistFile_iface; + else { + WARN("unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - return E_NOINTERFACE; + /* Violation of the COM aggregation ref counting rule */ + IUnknown_AddRef(&This->IUnknown_inner); + return S_OK; } -static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface) +static ULONG WINAPI IUnknown_fnAddRef(IUnknown *iface) { - IAVIFileImpl *This = impl_from_IAVIFile(iface); + IAVIFileImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -213,29 +226,26 @@ static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface) return ref; } -static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface) +static ULONG WINAPI IUnknown_fnRelease(IUnknown *iface) { - IAVIFileImpl *This = impl_from_IAVIFile(iface); + IAVIFileImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); UINT i; TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - if (This->fDirty) { - /* need to write headers to file */ + if (This->fDirty) AVIFILE_SaveFile(This); - } for (i = 0; i < This->fInfo.dwStreams; i++) { if (This->ppStreams[i] != NULL) { - if (This->ppStreams[i]->ref != 0) { + if (This->ppStreams[i]->ref != 0) ERR(": someone has still %u reference to stream %u (%p)!\n", - This->ppStreams[i]->ref, i, This->ppStreams[i]); - } - AVIFILE_DestructAVIStream(This->ppStreams[i]); - HeapFree(GetProcessHeap(), 0, This->ppStreams[i]); - This->ppStreams[i] = NULL; + This->ppStreams[i]->ref, i, This->ppStreams[i]); + AVIFILE_DestructAVIStream(This->ppStreams[i]); + HeapFree(GetProcessHeap(), 0, This->ppStreams[i]); + This->ppStreams[i] = NULL; } } @@ -264,6 +274,34 @@ static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface) return ref; } +static const IUnknownVtbl unk_vtbl = +{ + IUnknown_fnQueryInterface, + IUnknown_fnAddRef, + IUnknown_fnRelease +}; + +static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID riid, void **ppv) +{ + IAVIFileImpl *This = impl_from_IAVIFile(iface); + + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface) +{ + IAVIFileImpl *This = impl_from_IAVIFile(iface); + + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface) +{ + IAVIFileImpl *This = impl_from_IAVIFile(iface); + + return IUnknown_Release(This->outer_unk); +} + static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, AVIFILEINFOW *afi, LONG size) { IAVIFileImpl *This = impl_from_IAVIFile(iface); @@ -485,25 +523,25 @@ static const struct IAVIFileVtbl avif_vt = { }; -static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, REFIID refiid, void **ppv) +static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, REFIID riid, void **ppv) { IAVIFileImpl *This = impl_from_IPersistFile(iface); - return IAVIFile_QueryInterface(&This->IAVIFile_iface, refiid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface) { IAVIFileImpl *This = impl_from_IPersistFile(iface); - return IAVIFile_AddRef(&This->IAVIFile_iface); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI IPersistFile_fnRelease(IPersistFile *iface) { IAVIFileImpl *This = impl_from_IPersistFile(iface); - return IAVIFile_Release(&This->IAVIFile_iface); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface, LPCLSID pClassID) @@ -634,7 +672,7 @@ static const struct IPersistFileVtbl pf_vt = { IPersistFile_fnGetCurFile }; -HRESULT AVIFILE_CreateAVIFile(REFIID riid, void **ppv) +HRESULT AVIFILE_CreateAVIFile(IUnknown *pUnkOuter, REFIID riid, void **ppv) { IAVIFileImpl *obj; HRESULT hr; @@ -644,13 +682,17 @@ HRESULT AVIFILE_CreateAVIFile(REFIID riid, void **ppv) if (!obj) return AVIERR_MEMORY; + obj->IUnknown_inner.lpVtbl = &unk_vtbl; obj->IAVIFile_iface.lpVtbl = &avif_vt; obj->IPersistFile_iface.lpVtbl = &pf_vt; - obj->ref = 0; - - hr = IAVIFile_QueryInterface(&obj->IAVIFile_iface, riid, ppv); - if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, obj); + obj->ref = 1; + if (pUnkOuter) + obj->outer_unk = pUnkOuter; + else + obj->outer_unk = &obj->IUnknown_inner; + + hr = IUnknown_QueryInterface(&obj->IUnknown_inner, riid, ppv); + IUnknown_Release(&obj->IUnknown_inner); return hr; } diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index b9390c6..01f0ae6 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -58,7 +58,7 @@ DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0); extern HMODULE AVIFILE_hModule DECLSPEC_HIDDEN; -extern HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT AVIFILE_CreateAVIFile(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 295f11f..330022c 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -140,12 +140,19 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface, TRACE("(%p,%p,%s,%p)\n", iface, pOuter, debugstr_guid(riid), ppobj); - if (ppobj == NULL || pOuter != NULL) - return E_FAIL; + if (!ppobj) + return E_INVALIDARG; *ppobj = NULL; + if (pOuter && !IsEqualGUID(&IID_IUnknown, riid)) + return E_INVALIDARG; + if (IsEqualGUID(&CLSID_AVIFile, &This->clsid)) - return AVIFILE_CreateAVIFile(riid,ppobj); + return AVIFILE_CreateAVIFile(pOuter, riid, ppobj); + + if (pOuter) + return CLASS_E_NOAGGREGATION; + if (IsEqualGUID(&CLSID_ICMStream, &This->clsid)) return AVIFILE_CreateICMStream(riid,ppobj); if (IsEqualGUID(&CLSID_WAVFile, &This->clsid))

1 0

Michael Stefaniuc : avifil32: Avoid forward declaration of IAVIFile/ IPersistFile methods.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 39127a0700855f5dd8db695cdfb2066ece708b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39127a0700855f5dd8db695cd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 7 00:43:14 2013 +0100 avifil32: Avoid forward declaration of IAVIFile/IPersistFile methods. --- dlls/avifil32/avifile.c | 119 ++++++++++++++++++----------------------------- 1 files changed, 46 insertions(+), 73 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 8ea6127..408808c 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -54,54 +54,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); #define IDX_PER_BLOCK 2730 #endif -/***********************************************************************/ - -static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile* iface); -static ULONG WINAPI IAVIFile_fnRelease(IAVIFile* iface); -static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile*iface,AVIFILEINFOW*afi,LONG size); -static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile*iface,PAVISTREAM*avis,DWORD fccType,LONG lParam); -static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile*iface,PAVISTREAM*avis,AVISTREAMINFOW*asi); -static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG size); -static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG *size); -static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile*iface); -static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam); - -static const struct IAVIFileVtbl iavift = { - IAVIFile_fnQueryInterface, - IAVIFile_fnAddRef, - IAVIFile_fnRelease, - IAVIFile_fnInfo, - IAVIFile_fnGetStream, - IAVIFile_fnCreateStream, - IAVIFile_fnWriteData, - IAVIFile_fnReadData, - IAVIFile_fnEndRecord, - IAVIFile_fnDeleteStream -}; - -static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile*iface,REFIID refiid,LPVOID*obj); -static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile*iface); -static ULONG WINAPI IPersistFile_fnRelease(IPersistFile*iface); -static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile*iface,CLSID*pClassID); -static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile*iface); -static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile*iface,LPCOLESTR pszFileName,DWORD dwMode); -static HRESULT WINAPI IPersistFile_fnSave(IPersistFile*iface,LPCOLESTR pszFileName,BOOL fRemember); -static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile*iface,LPCOLESTR pszFileName); -static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile*iface,LPOLESTR*ppszFileName); - -static const struct IPersistFileVtbl ipersistft = { - IPersistFile_fnQueryInterface, - IPersistFile_fnAddRef, - IPersistFile_fnRelease, - IPersistFile_fnGetClassID, - IPersistFile_fnIsDirty, - IPersistFile_fnLoad, - IPersistFile_fnSave, - IPersistFile_fnSaveCompleted, - IPersistFile_fnGetCurFile -}; - static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj); static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface); static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface); @@ -228,30 +180,6 @@ static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size); -HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv) -{ - IAVIFileImpl *pfile; - HRESULT hr; - - assert(riid != NULL && ppv != NULL); - - *ppv = NULL; - - pfile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIFileImpl)); - if (pfile == NULL) - return AVIERR_MEMORY; - - pfile->IAVIFile_iface.lpVtbl = &iavift; - pfile->IPersistFile_iface.lpVtbl = &ipersistft; - pfile->ref = 0; - - hr = IAVIFile_QueryInterface(&pfile->IAVIFile_iface, riid, ppv); - if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, pfile); - - return hr; -} - static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, LPVOID *obj) { @@ -543,6 +471,19 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LO return AVIERR_NODATA; } +static const struct IAVIFileVtbl avif_vt = { + IAVIFile_fnQueryInterface, + IAVIFile_fnAddRef, + IAVIFile_fnRelease, + IAVIFile_fnInfo, + IAVIFile_fnGetStream, + IAVIFile_fnCreateStream, + IAVIFile_fnWriteData, + IAVIFile_fnReadData, + IAVIFile_fnEndRecord, + IAVIFile_fnDeleteStream +}; + static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, REFIID refiid, void **ppv) { @@ -681,7 +622,39 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *p return AVIERR_OK; } -/***********************************************************************/ +static const struct IPersistFileVtbl pf_vt = { + IPersistFile_fnQueryInterface, + IPersistFile_fnAddRef, + IPersistFile_fnRelease, + IPersistFile_fnGetClassID, + IPersistFile_fnIsDirty, + IPersistFile_fnLoad, + IPersistFile_fnSave, + IPersistFile_fnSaveCompleted, + IPersistFile_fnGetCurFile +}; + +HRESULT AVIFILE_CreateAVIFile(REFIID riid, void **ppv) +{ + IAVIFileImpl *obj; + HRESULT hr; + + *ppv = NULL; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIFileImpl)); + if (!obj) + return AVIERR_MEMORY; + + obj->IAVIFile_iface.lpVtbl = &avif_vt; + obj->IPersistFile_iface.lpVtbl = &pf_vt; + obj->ref = 0; + + hr = IAVIFile_QueryInterface(&obj->IAVIFile_iface, riid, ppv); + if (FAILED(hr)) + HeapFree(GetProcessHeap(), 0, obj); + + return hr; +} + static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface, REFIID refiid, LPVOID *obj)

1 0

Michael Stefaniuc : avifil32: Merge and cleanup the IPersistFile iface.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: c52d915e2b6ee0cdfb96c4bbf5d99724fd54d7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52d915e2b6ee0cdfb96c4bbf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 7 00:42:27 2013 +0100 avifil32: Merge and cleanup the IPersistFile iface. --- dlls/avifil32/avifile.c | 115 ++++++++++++++++++----------------------------- 1 files changed, 44 insertions(+), 71 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index b8811fd..8ea6127 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -136,14 +136,6 @@ static const struct IAVIStreamVtbl iavist = { typedef struct _IAVIFileImpl IAVIFileImpl; -typedef struct _IPersistFileImpl { - /* IUnknown stuff */ - const IPersistFileVtbl *lpVtbl; - - /* IPersistFile stuff */ - IAVIFileImpl *paf; -} IPersistFileImpl; - typedef struct _IAVIStreamImpl { /* IUnknown stuff */ const IAVIStreamVtbl *lpVtbl; @@ -175,11 +167,9 @@ typedef struct _IAVIStreamImpl { struct _IAVIFileImpl { IAVIFile IAVIFile_iface; + IPersistFile IPersistFile_iface; LONG ref; - /* IAVIFile stuff... */ - IPersistFileImpl iPersistFile; - AVIFILEINFOW fInfo; IAVIStreamImpl *ppStreams[MAX_AVISTREAMS]; @@ -207,6 +197,11 @@ static inline IAVIFileImpl *impl_from_IAVIFile(IAVIFile *iface) return CONTAINING_RECORD(iface, IAVIFileImpl, IAVIFile_iface); } +static inline IAVIFileImpl *impl_from_IPersistFile(IPersistFile *iface) +{ + return CONTAINING_RECORD(iface, IAVIFileImpl, IPersistFile_iface); +} + /***********************************************************************/ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, @@ -247,9 +242,8 @@ HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv) return AVIERR_MEMORY; pfile->IAVIFile_iface.lpVtbl = &iavift; + pfile->IPersistFile_iface.lpVtbl = &ipersistft; pfile->ref = 0; - pfile->iPersistFile.lpVtbl = &ipersistft; - pfile->iPersistFile.paf = pfile; hr = IAVIFile_QueryInterface(&pfile->IAVIFile_iface, riid, ppv); if (FAILED(hr)) @@ -272,7 +266,7 @@ static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, return S_OK; } else if (IsEqualGUID(&IID_IPersistFile, refiid)) { - *obj = &This->iPersistFile; + *obj = &This->IPersistFile_iface; IAVIFile_AddRef(iface); return S_OK; @@ -549,38 +543,29 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LO return AVIERR_NODATA; } -/***********************************************************************/ -static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, - REFIID refiid, LPVOID *obj) +static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, REFIID refiid, void **ppv) { - IPersistFileImpl *This = (IPersistFileImpl *)iface; - - assert(This->paf != NULL); + IAVIFileImpl *This = impl_from_IPersistFile(iface); - return IAVIFile_QueryInterface((PAVIFILE)This->paf, refiid, obj); + return IAVIFile_QueryInterface(&This->IAVIFile_iface, refiid, ppv); } -static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface) +static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface) { - IPersistFileImpl *This = (IPersistFileImpl *)iface; + IAVIFileImpl *This = impl_from_IPersistFile(iface); - assert(This->paf != NULL); - - return IAVIFile_AddRef((PAVIFILE)This->paf); + return IAVIFile_AddRef(&This->IAVIFile_iface); } -static ULONG WINAPI IPersistFile_fnRelease(IPersistFile *iface) +static ULONG WINAPI IPersistFile_fnRelease(IPersistFile *iface) { - IPersistFileImpl *This = (IPersistFileImpl *)iface; + IAVIFileImpl *This = impl_from_IPersistFile(iface); - assert(This->paf != NULL); - - return IAVIFile_Release((PAVIFILE)This->paf); + return IAVIFile_Release(&This->IAVIFile_iface); } -static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface, - LPCLSID pClassID) +static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface, LPCLSID pClassID) { TRACE("(%p,%p)\n", iface, pClassID); @@ -594,20 +579,16 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface, static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile *iface) { - IPersistFileImpl *This = (IPersistFileImpl *)iface; + IAVIFileImpl *This = impl_from_IPersistFile(iface); TRACE("(%p)\n", iface); - assert(This->paf != NULL); - - return (This->paf->fDirty ? S_OK : S_FALSE); + return (This->fDirty ? S_OK : S_FALSE); } -static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface, - LPCOLESTR pszFileName, DWORD dwMode) +static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface, LPCOLESTR pszFileName, DWORD dwMode) { - IPersistFileImpl *This = (IPersistFileImpl *)iface; - + IAVIFileImpl *This = impl_from_IPersistFile(iface); int len; TRACE("(%p,%s,0x%08X)\n", iface, debugstr_w(pszFileName), dwMode); @@ -616,53 +597,49 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface, if (pszFileName == NULL) return AVIERR_BADPARAM; - assert(This->paf != NULL); - if (This->paf->hmmio != NULL) + if (This->hmmio != NULL) return AVIERR_ERROR; /* No reuse of this object for another file! */ /* remember mode and name */ - This->paf->uMode = dwMode; + This->uMode = dwMode; len = lstrlenW(pszFileName) + 1; - This->paf->szFileName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (This->paf->szFileName == NULL) + This->szFileName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (This->szFileName == NULL) return AVIERR_MEMORY; - lstrcpyW(This->paf->szFileName, pszFileName); + lstrcpyW(This->szFileName, pszFileName); /* try to open the file */ - This->paf->hmmio = mmioOpenW(This->paf->szFileName, NULL, - MMIO_ALLOCBUF | dwMode); - if (This->paf->hmmio == NULL) { + This->hmmio = mmioOpenW(This->szFileName, NULL, MMIO_ALLOCBUF | dwMode); + if (This->hmmio == NULL) { /* mmioOpenW not in native DLLs of Win9x -- try mmioOpenA */ LPSTR szFileName; - len = WideCharToMultiByte(CP_ACP, 0, This->paf->szFileName, -1, - NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, This->szFileName, -1, NULL, 0, NULL, NULL); szFileName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(CHAR)); if (szFileName == NULL) return AVIERR_MEMORY; - WideCharToMultiByte(CP_ACP, 0, This->paf->szFileName, -1, szFileName, - len, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, This->szFileName, -1, szFileName, len, NULL, NULL); - This->paf->hmmio = mmioOpenA(szFileName, NULL, MMIO_ALLOCBUF | dwMode); + This->hmmio = mmioOpenA(szFileName, NULL, MMIO_ALLOCBUF | dwMode); HeapFree(GetProcessHeap(), 0, szFileName); - if (This->paf->hmmio == NULL) + if (This->hmmio == NULL) return AVIERR_FILEOPEN; } /* should we create a new file? */ if (dwMode & OF_CREATE) { - memset(& This->paf->fInfo, 0, sizeof(This->paf->fInfo)); - This->paf->fInfo.dwFlags = AVIFILEINFO_HASINDEX | AVIFILEINFO_TRUSTCKTYPE; + memset(& This->fInfo, 0, sizeof(This->fInfo)); + This->fInfo.dwFlags = AVIFILEINFO_HASINDEX | AVIFILEINFO_TRUSTCKTYPE; return AVIERR_OK; } else - return AVIFILE_LoadFile(This->paf); + return AVIFILE_LoadFile(This); } -static HRESULT WINAPI IPersistFile_fnSave(IPersistFile *iface, - LPCOLESTR pszFileName,BOOL fRemember) +static HRESULT WINAPI IPersistFile_fnSave(IPersistFile *iface, LPCOLESTR pszFileName, + BOOL fRemember) { TRACE("(%p,%s,%d)\n", iface, debugstr_w(pszFileName), fRemember); @@ -671,8 +648,7 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile *iface, return AVIERR_OK; } -static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile *iface, - LPCOLESTR pszFileName) +static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile *iface, LPCOLESTR pszFileName) { TRACE("(%p,%s)\n", iface, debugstr_w(pszFileName)); @@ -681,10 +657,9 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile *iface, return AVIERR_OK; } -static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, - LPOLESTR *ppszFileName) +static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *ppszFileName) { - IPersistFileImpl *This = (IPersistFileImpl *)iface; + IAVIFileImpl *This = impl_from_IPersistFile(iface); TRACE("(%p,%p)\n", iface, ppszFileName); @@ -693,16 +668,14 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, *ppszFileName = NULL; - assert(This->paf != NULL); - - if (This->paf->szFileName != NULL) { - int len = lstrlenW(This->paf->szFileName) + 1; + if (This->szFileName != NULL) { + int len = lstrlenW(This->szFileName) + 1; *ppszFileName = CoTaskMemAlloc(len * sizeof(WCHAR)); if (*ppszFileName == NULL) return AVIERR_MEMORY; - strcpyW(*ppszFileName, This->paf->szFileName); + strcpyW(*ppszFileName, This->szFileName); } return AVIERR_OK;

1 0

Michael Stefaniuc : avifil32: COM cleanup for the IAVIFile iface.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 8e6c79b3ccac1660fc36fc7f52e897265388b92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6c79b3ccac1660fc36fc7f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 7 00:39:26 2013 +0100 avifil32: COM cleanup for the IAVIFile iface. --- dlls/avifil32/avifile.c | 69 ++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 36 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 885d239..b8811fd 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -174,9 +174,8 @@ typedef struct _IAVIStreamImpl { } IAVIStreamImpl; struct _IAVIFileImpl { - /* IUnknown stuff */ - const IAVIFileVtbl *lpVtbl; - LONG ref; + IAVIFile IAVIFile_iface; + LONG ref; /* IAVIFile stuff... */ IPersistFileImpl iPersistFile; @@ -203,6 +202,11 @@ struct _IAVIFileImpl { BOOL fDirty; }; +static inline IAVIFileImpl *impl_from_IAVIFile(IAVIFile *iface) +{ + return CONTAINING_RECORD(iface, IAVIFileImpl, IAVIFile_iface); +} + /***********************************************************************/ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, @@ -242,12 +246,12 @@ HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv) if (pfile == NULL) return AVIERR_MEMORY; - pfile->lpVtbl = &iavift; + pfile->IAVIFile_iface.lpVtbl = &iavift; pfile->ref = 0; pfile->iPersistFile.lpVtbl = &ipersistft; pfile->iPersistFile.paf = pfile; - hr = IAVIFile_QueryInterface((IAVIFile*)pfile, riid, ppv); + hr = IAVIFile_QueryInterface(&pfile->IAVIFile_iface, riid, ppv); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, pfile); @@ -257,7 +261,7 @@ HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv) static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, LPVOID *obj) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); @@ -274,26 +278,26 @@ static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, return S_OK; } - return OLE_E_ENUM_NOMORE; + return E_NOINTERFACE; } static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; + IAVIFileImpl *This = impl_from_IAVIFile(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) -> %d\n", iface, ref); + TRACE("(%p) ref=%d\n", This, ref); return ref; } static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; - UINT i; + IAVIFileImpl *This = impl_from_IAVIFile(iface); ULONG ref = InterlockedDecrement(&This->ref); + UINT i; - TRACE("(%p) -> %d\n", iface, ref); + TRACE("(%p) ref=%d\n", This, ref); if (!ref) { if (This->fDirty) { @@ -338,10 +342,9 @@ static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface) return ref; } -static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi, - LONG size) +static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, AVIFILEINFOW *afi, LONG size) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,%p,%d)\n",iface,afi,size); @@ -359,11 +362,10 @@ static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi, return AVIERR_OK; } -static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis, - DWORD fccType, LONG lParam) +static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, DWORD fccType, + LONG lParam) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; - + IAVIFileImpl *This = impl_from_IAVIFile(iface); ULONG nStream; TRACE("(%p,%p,0x%08X,%d)\n", iface, avis, fccType, lParam); @@ -386,11 +388,10 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis, return AVIERR_NODATA; } -static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis, - LPAVISTREAMINFOW asi) +static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface, IAVIStream **avis, + AVISTREAMINFOW *asi) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; - + IAVIFileImpl *This = impl_from_IAVIFile(iface); DWORD n; TRACE("(%p,%p,%p)\n", iface, avis, asi); @@ -440,10 +441,9 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis, return AVIERR_OK; } -static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, - LPVOID lpData, LONG size) +static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, void *lpData, LONG size) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,0x%08X,%p,%d)\n", iface, ckid, lpData, size); @@ -462,10 +462,9 @@ static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, return WriteExtraChunk(&This->fileextra, ckid, lpData, size); } -static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid, - LPVOID lpData, LONG *size) +static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid, void *lpData, LONG *size) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,0x%08X,%p,%p)\n", iface, ckid, lpData, size); @@ -474,7 +473,7 @@ static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid, static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile *iface) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p)\n",iface); @@ -513,11 +512,9 @@ static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile *iface) return AVIERR_OK; } -static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, - LONG lParam) +static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LONG lParam) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; - + IAVIFileImpl *This = impl_from_IAVIFile(iface); ULONG nStream; TRACE("(%p,0x%08X,%d)\n", iface, fccType, lParam); @@ -741,7 +738,7 @@ static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface) /* also add ref to parent, so that it doesn't kill us */ if (This->paf != NULL) - IAVIFile_AddRef((PAVIFILE)This->paf); + IAVIFile_AddRef(&This->paf->IAVIFile_iface); return ref; } @@ -754,7 +751,7 @@ static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface) TRACE("(%p) -> %d\n", iface, ref); if (This->paf != NULL) - IAVIFile_Release((PAVIFILE)This->paf); + IAVIFile_Release(&This->paf->IAVIFile_iface); return ref; }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLParser Get/Set Factory.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 850d077a4bf65a3c4f0682589eff2692ba8d2f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850d077a4bf65a3c4f0682589… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 6 16:01:45 2013 +1100 msxml3: Implement IXMLParser Get/Set Factory. --- dlls/msxml3/tests/xmlparser.c | 88 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/xmlparser.c | 28 +++++++++++-- 2 files changed, 112 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/xmlparser.c b/dlls/msxml3/tests/xmlparser.c index 4bf80bb..46812c8 100644 --- a/dlls/msxml3/tests/xmlparser.c +++ b/dlls/msxml3/tests/xmlparser.c @@ -28,10 +28,81 @@ #include "xmlparser.h" #include "wine/test.h" + +static HRESULT WINAPI nodefact_QueryInterface(IXMLNodeFactory *iface, + REFIID riid, void **ppvObject) +{ + *ppvObject = NULL; + + if (IsEqualGUID(riid, &IID_IXMLNodeFactory) || + IsEqualGUID(riid, &IID_IUnknown)) + *ppvObject = iface; + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI nodefact_AddRef(IXMLNodeFactory *iface) +{ + return 2; +} + +static ULONG WINAPI nodefact_Release(IXMLNodeFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI nodefact_NotifyEvent(IXMLNodeFactory *iface, + IXMLNodeSource *pSource, XML_NODEFACTORY_EVENT iEvt) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI nodefact_BeginChildren(IXMLNodeFactory *iface, + IXMLNodeSource *pSource, XML_NODE_INFO *pNodeInfo) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI nodefact_EndChildren(IXMLNodeFactory *iface, + IXMLNodeSource *pSource, BOOL fEmpty, XML_NODE_INFO *pNodeInfo) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI nodefact_Error(IXMLNodeFactory *iface, + IXMLNodeSource *pSource, HRESULT hrErrorCode, USHORT cNumRecs, + XML_NODE_INFO **ppNodeInfo) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI nodefact_CreateNode(IXMLNodeFactory *iface, IXMLNodeSource *pSource, + PVOID pNodeParent, USHORT cNumRecs, XML_NODE_INFO **ppNodeInfo) +{ + return E_NOTIMPL; +} + +static const IXMLNodeFactoryVtbl nodefactoryVtbl = +{ + nodefact_QueryInterface, + nodefact_AddRef, + nodefact_Release, + nodefact_NotifyEvent, + nodefact_BeginChildren, + nodefact_EndChildren, + nodefact_Error, + nodefact_CreateNode +}; + +static IXMLNodeFactory thenodefactory = { &nodefactoryVtbl }; + static void create_test(void) { HRESULT hr; IXMLParser *parser; + IXMLNodeFactory *nodefactory; DWORD flags; hr = CoCreateInstance(&CLSID_XMLParser30, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLParser, (void**)&parser); @@ -50,6 +121,23 @@ static void create_test(void) flags = IXMLParser_GetFlags(parser); ok(flags == XMLFLAG_SAX, "Expected 0 got %d\n", flags); + hr = IXMLParser_GetFactory(parser, NULL); + ok(hr == E_INVALIDARG, "Expected S_OK got 0x%08x\n", hr); + + hr = IXMLParser_GetFactory(parser, &nodefactory); + ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); + ok(nodefactory == NULL, "expected NULL\n"); + + hr = IXMLParser_SetFactory(parser, &thenodefactory); + ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); + + hr = IXMLParser_GetFactory(parser, &nodefactory); + ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); + ok(nodefactory == &thenodefactory, "expected NULL\n"); + + hr = IXMLParser_SetFactory(parser, NULL); + ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); + hr = IXMLParser_SetFlags(parser, 0); ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c index f18f454..154e439 100644 --- a/dlls/msxml3/xmlparser.c +++ b/dlls/msxml3/xmlparser.c @@ -46,6 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _xmlparser { IXMLParser IXMLParser_iface; + IXMLNodeFactory *nodefactory; LONG ref; int flags; @@ -95,6 +96,9 @@ static ULONG WINAPI xmlparser_Release(IXMLParser* iface) TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { + if(This->nodefactory) + IXMLNodeFactory_Release(This->nodefactory); + heap_free( This ); } @@ -106,18 +110,33 @@ static HRESULT WINAPI xmlparser_SetFactory(IXMLParser *iface, IXMLNodeFactory *p { xmlparser *This = impl_from_IXMLParser( iface ); - FIXME("(%p %p)\n", This, pNodeFactory); + TRACE("(%p %p)\n", This, pNodeFactory); - return E_NOTIMPL; + if(This->nodefactory) + IXMLNodeFactory_Release(This->nodefactory); + + This->nodefactory = pNodeFactory; + if(This->nodefactory) + IXMLNodeFactory_AddRef(This->nodefactory); + + return S_OK; } static HRESULT WINAPI xmlparser_GetFactory(IXMLParser *iface, IXMLNodeFactory **ppNodeFactory) { xmlparser *This = impl_from_IXMLParser( iface ); - FIXME("(%p, %p)\n", This, ppNodeFactory); + TRACE("(%p, %p)\n", This, ppNodeFactory); - return E_NOTIMPL; + if(!ppNodeFactory) + return E_INVALIDARG; + + *ppNodeFactory = This->nodefactory; + + if(*ppNodeFactory) + IXMLNodeFactory_AddRef(*ppNodeFactory); + + return S_OK; } static HRESULT WINAPI xmlparser_Abort(IXMLParser *iface, BSTR bstrErrorInfo) @@ -415,6 +434,7 @@ HRESULT XMLParser_create(IUnknown* pUnkOuter, void**ppObj) return E_OUTOFMEMORY; This->IXMLParser_iface.lpVtbl = &xmlparser_vtbl; + This->nodefactory = NULL; This->flags = 0; This->ref = 1;

1 0

Michael Stefaniuc : avifil32/tests: Add COM tests for AVIFile.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: e86619413ecb50ad224b0d1705dc17c5afb085ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86619413ecb50ad224b0d170… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 7 00:46:17 2013 +0100 avifil32/tests: Add COM tests for AVIFile. --- dlls/avifil32/tests/Makefile.in | 2 +- dlls/avifil32/tests/api.c | 119 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 114 insertions(+), 7 deletions(-) diff --git a/dlls/avifil32/tests/Makefile.in b/dlls/avifil32/tests/Makefile.in index 658b096..abe1ad4 100644 --- a/dlls/avifil32/tests/Makefile.in +++ b/dlls/avifil32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = avifil32.dll -IMPORTS = avifil32 +IMPORTS = avifil32 ole32 C_SRCS = \ api.c diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 4b87806..22c15c5 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -19,14 +19,13 @@ * */ -#include <stdarg.h> +#define COBJMACROS +#define CONST_VTABLE -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "wine/test.h" +#include "initguid.h" #include "wingdi.h" #include "vfw.h" -#include "wine/test.h" /* ########################### */ @@ -541,7 +540,114 @@ static void test_ash1_corruption2(void) ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); } -/* ########################### */ +/* Outer IUnknown for COM aggregation tests */ +struct unk_impl { + IUnknown IUnknown_iface; + LONG ref; + IUnknown *inner_unk; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + LONG ref = This->ref; + HRESULT hr; + + if (IsEqualGUID(riid, &IID_IUnknown)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + hr = IUnknown_QueryInterface(This->inner_unk, riid, ppv); + if (hr == S_OK) + { + trace("Working around COM aggregation ref counting bug\n"); + ok(ref == This->ref, "Outer ref count expected %d got %d\n", ref, This->ref); + IUnknown_AddRef((IUnknown*)*ppv); + ref = IUnknown_Release(This->inner_unk); + ok(ref == 1, "Inner ref count expected 1 got %d\n", ref); + } + + return hr; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + +static void test_COM(void) +{ + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + IAVIFile *avif = NULL; + IPersistFile *pf; + IUnknown *unk; + LONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_AVIFile, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + ok(hr == S_OK, "COM aggregation failed: %08x, expected S_OK\n", hr); + hr = IUnknown_QueryInterface(&unk_obj.IUnknown_iface, &IID_IAVIFile, (void**)&avif); + ok(hr == S_OK, "QueryInterface for IID_IAVIFile failed: %08x\n", hr); + refcount = IAVIFile_AddRef(avif); + ok(refcount == unk_obj.ref, "AVIFile just pretends to support COM aggregation\n"); + refcount = IAVIFile_Release(avif); + ok(refcount == unk_obj.ref, "AVIFile just pretends to support COM aggregation\n"); + hr = IAVIFile_QueryInterface(avif, &IID_IPersistFile, (void**)&pf); + ok(hr == S_OK, "QueryInterface for IID_IPersistFile failed: %08x\n", hr); + refcount = IPersistFile_Release(pf); + ok(refcount == unk_obj.ref, "AVIFile just pretends to support COM aggregation\n"); + refcount = IAVIFile_Release(avif); + ok(refcount == 19, "Outer ref count should be back at 19 but is %d\n", refcount); + refcount = IUnknown_Release(unk_obj.inner_unk); + ok(refcount == 0, "Inner ref count should be 0 but is %u\n", refcount); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_AVIFile, NULL, CLSCTX_INPROC_SERVER, &IID_IAVIStream, + (void**)&avif); + ok(hr == E_NOINTERFACE, "AVIFile create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount */ + hr = CoCreateInstance(&CLSID_AVIFile, NULL, CLSCTX_INPROC_SERVER, &IID_IAVIFile, (void**)&avif); + ok(hr == S_OK, "AVIFile create failed: %08x, expected S_OK\n", hr); + refcount = IAVIFile_AddRef(avif); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IAVIFile_QueryInterface(avif, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + hr = IAVIFile_QueryInterface(avif, &IID_IPersistFile, (void**)&pf); + ok(hr == S_OK, "QueryInterface for IID_IPersistFile failed: %08x\n", hr); + refcount = IPersistFile_AddRef(pf); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + + while (IAVIFile_Release(avif)); +} START_TEST(api) { @@ -553,6 +659,7 @@ START_TEST(api) test_amh_corruption(); test_ash1_corruption(); test_ash1_corruption2(); + test_COM(); AVIFileExit(); }

1 0

Piotr Caban : wininet: Added better urlcache index file validation on first open.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: ee1fdbf24604c5e1c5c8b96e68b12d1e12ce7d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1fdbf24604c5e1c5c8b96e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 7 13:50:14 2013 +0100 wininet: Added better urlcache index file validation on first open. index.dat file may get broken when computer is switched off incorrectly or when application crashes --- dlls/wininet/urlcache.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 9d9f2e1..da20c68 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -385,6 +385,41 @@ static DWORD cache_container_set_size(URLCACHECONTAINER *container, HANDLE file, return ERROR_SUCCESS; } +static BOOL cache_container_is_valid(URLCACHE_HEADER *header, DWORD file_size) +{ + DWORD allocation_size, count_bits, i; + + if(file_size < FILE_SIZE(MIN_BLOCK_NO)) + return FALSE; + + if(file_size != header->dwFileSize) + return FALSE; + + if (!memcmp(header->szSignature, urlcache_ver_prefix, sizeof(urlcache_ver_prefix)-1) && + memcmp(header->szSignature+sizeof(urlcache_ver_prefix)-1, urlcache_ver, sizeof(urlcache_ver)-1)) + return FALSE; + + if(FILE_SIZE(header->dwIndexCapacityInBlocks) != file_size) + return FALSE; + + allocation_size = 0; + for(i=0; i<header->dwIndexCapacityInBlocks/8; i++) { + for(count_bits = header->allocation_table[i]; count_bits!=0; count_bits>>=1) { + if(count_bits & 1) + allocation_size++; + } + } + if(allocation_size != header->dwBlocksInUse) + return FALSE; + + for(; i<ALLOCATION_TABLE_SIZE; i++) { + if(header->allocation_table[i]) + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * cache_container_open_index (Internal) * @@ -451,8 +486,7 @@ static DWORD cache_container_open_index(URLCACHECONTAINER *container, DWORD bloc if(container->hMapping && validate) { URLCACHE_HEADER *header = MapViewOfFile(container->hMapping, FILE_MAP_WRITE, 0, 0, 0); - if(header && !memcmp(header->szSignature, urlcache_ver_prefix, sizeof(urlcache_ver_prefix)-1) && - memcmp(header->szSignature+sizeof(urlcache_ver_prefix)-1, urlcache_ver, sizeof(urlcache_ver)-1)) { + if(header && !cache_container_is_valid(header, file_size)) { WARN("detected old or broken index.dat file\n"); UnmapViewOfFile(header); FreeUrlCacheSpaceW(container->path, 100, 0);

1 0

Francois Gouget : qcap: Fix compilation on systems that have v4l1 but not VIDIOCMCAPTURE & co.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: e920d1a661de133e941eb07bf0ad8ead0b0f38d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e920d1a661de133e941eb07bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 6 15:11:40 2013 +0100 qcap: Fix compilation on systems that have v4l1 but not VIDIOCMCAPTURE & co. --- dlls/qcap/v4l.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 41cc752..0880499 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -71,7 +71,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); -#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_H) +#ifdef VIDIOCMCAPTURE static typeof(open) *video_open = open; static typeof(close) *video_close = close; @@ -973,4 +973,4 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) FAIL_WITH_ERR; } -#endif /* HAVE_LINUX_VIDEODEV_H || HAVE_LINUX_LIBV4L1_H */ +#endif /* defined(VIDIOCMCAPTURE) */

1 0

Alexandre Julliard : wininet: Always pass a ULONG variable to ioctlsocket.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 456773fdc067ab8673a330c7ae17aecc2815690a URL: http://source.winehq.org/git/wine.git/?a=commit;h=456773fdc067ab8673a330c7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 13:32:49 2013 +0100 wininet: Always pass a ULONG variable to ioctlsocket. --- dlls/wininet/netconnection.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 0d74adf..3564282 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -607,7 +607,8 @@ static DWORD init_openssl(void) static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) { - int result, flag; + int result; + ULONG flag; assert(server->addr_len); result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); @@ -633,7 +634,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t { int err; socklen_t len = sizeof(err); - if (!getsockopt(netconn->socket, SOL_SOCKET, SO_ERROR, &err, &len) && !err) + if (!getsockopt(netconn->socket, SOL_SOCKET, SO_ERROR, (void *)&err, &len) && !err) result = 0; } } @@ -1003,7 +1004,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) if(!connection->secure) { #ifdef FIONREAD - int unread; + ULONG unread; int retval = ioctlsocket(connection->socket, FIONREAD, &unread); if (!retval) {

1 0

Piotr Caban : wininet: Improved urlcache debug traces.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: b3c96b61bb790e28f5b71d038dbce58525cccd45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c96b61bb790e28f5b71d038… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 6 12:48:15 2013 +0100 wininet: Improved urlcache debug traces. --- dlls/wininet/urlcache.c | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 578473d..0c9a4e2 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1803,15 +1803,16 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + FIXME("Trying to retrieve entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); - if (pUrlEntry->dwOffsetHeaderInfo) - TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + + pUrlEntry->dwOffsetHeaderInfo, pUrlEntry->dwHeaderInfoSize)); if((dwFlags & GET_INSTALLED_ENTRY) && !(pUrlEntry->CacheEntryType & INSTALLED_CACHE_ENTRY)) { @@ -1838,7 +1839,8 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + if(pUrlEntry->dwOffsetLocalName) + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); } URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1944,14 +1946,16 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + FIXME("Trying to retrieve entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); - TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + + pUrlEntry->dwOffsetHeaderInfo, pUrlEntry->dwHeaderInfoSize)); if (lpdwCacheEntryInfoBufSize) { @@ -1971,7 +1975,8 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + if(pUrlEntry->dwOffsetLocalName) + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); } URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -2169,8 +2174,9 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( return FALSE; } - TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); + TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo, + pUrlEntry->dwHeaderInfoSize)); error = URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, pUrlEntry, @@ -2266,8 +2272,9 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( return FALSE; } - TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); + TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo, + pUrlEntry->dwHeaderInfoSize)); error = URLCache_CopyEntry( pContainer, @@ -2593,7 +2600,7 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) continue; if(urlcache_rate_entry(url_entry, &cur_time) <= delete_factor) { - TRACE("deleting file: %s\n", (char*)url_entry+url_entry->dwOffsetLocalName); + TRACE("deleting file: %s\n", debugstr_a((char*)url_entry+url_entry->dwOffsetLocalName)); DeleteUrlCacheEntryInternal(container, header, hash_entry); if(header->CacheUsage.QuadPart+header->ExemptUsage.QuadPart <= desired_size) @@ -3978,7 +3985,8 @@ static BOOL FindNextUrlCacheEntryInternal( TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", - debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + debugstr_an((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo, + pUrlEntry->dwHeaderInfoSize)); error = URLCache_CopyEntry( pContainer, @@ -3993,8 +4001,8 @@ static BOOL FindNextUrlCacheEntryInternal( SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", - debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + if(pUrlEntry->dwOffsetLocalName) + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); /* increment the current index so that next time the function * is called the next entry is returned */

1 0

Alexandre Julliard : winhttp: Always pass a ULONG variable to ioctlsocket.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 847a29375c42433dbd70701d59d250f1a390ce0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=847a29375c42433dbd70701d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 13:32:44 2013 +0100 winhttp: Always pass a ULONG variable to ioctlsocket. --- dlls/winhttp/net.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5ce7683..2177416 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -331,7 +331,8 @@ BOOL netconn_close( netconn_t *conn ) BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned int addr_len, int timeout ) { BOOL ret = FALSE; - int res = 0, state; + int res = 0; + ULONG state; if (timeout > 0) { @@ -734,7 +735,8 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) { #ifdef FIONREAD - int ret, unread; + int ret; + ULONG unread; #endif *available = 0; if (!netconn_connected( conn )) return FALSE;

1 0

Francois Gouget : msvcrt: Remove WINAPI on static functions where not needed.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: c3913adb9bd5f2ad31cdf6387f315608ca0487b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3913adb9bd5f2ad31cdf6387… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 6 15:07:51 2013 +0100 msvcrt: Remove WINAPI on static functions where not needed. --- dlls/msvcrt/except.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 32cf3b0..b77daa1 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -86,7 +86,7 @@ static const struct { EXCEPTION_FLT_UNDERFLOW, MSVCRT__FPE_UNDERFLOW }, }; -static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) +static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { LONG ret = EXCEPTION_CONTINUE_SEARCH; MSVCRT___sighandler_t handler;

1 0

Hans Leidekker : wininet: Port resolution doesn't depend on the secure flag .
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 6a609c21bbee8287b2ee6d027013855843106a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a609c21bbee8287b2ee6d027… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 6 13:30:49 2013 +0100 wininet: Port resolution doesn't depend on the secure flag. --- dlls/wininet/http.c | 19 +++++++++++-------- dlls/wininet/tests/http.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 468fee6..8fec2a4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -283,7 +283,7 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL server_t *iter, *server = NULL; if(port == INTERNET_INVALID_PORT_NUMBER) - port = is_https ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + port = INTERNET_DEFAULT_HTTP_PORT; EnterCriticalSection(&connection_pool_cs); @@ -1706,6 +1706,9 @@ static WCHAR *build_proxy_path_url(http_request_t *req) */ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_request_t *request) { + static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; + static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; + static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; WCHAR buf[INTERNET_MAX_HOST_NAME_LENGTH]; WCHAR protoProxy[INTERNET_MAX_URL_LENGTH]; DWORD protoProxyLen = INTERNET_MAX_URL_LENGTH; @@ -1713,9 +1716,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; server_t *new_server; - static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; - static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; - static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; + BOOL is_https; memset( &UrlComponents, 0, sizeof UrlComponents ); UrlComponents.dwStructSize = sizeof UrlComponents; @@ -1737,7 +1738,11 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if( !request->path ) request->path = szNul; - new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, UrlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); + is_https = (UrlComponents.nScheme == INTERNET_SCHEME_HTTPS); + if (is_https && UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) + UrlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; + + new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, is_https, TRUE); if(!new_server) return FALSE; @@ -3160,9 +3165,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) - session->hostPort = (dwFlags & INTERNET_FLAG_SECURE ? - INTERNET_DEFAULT_HTTPS_PORT : - INTERNET_DEFAULT_HTTP_PORT); + session->hostPort = INTERNET_DEFAULT_HTTP_PORT; if (hIC->proxy && hIC->proxy[0]) HTTP_DealWithProxy( hIC, session, request ); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5f7a961..c682930 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4013,6 +4013,34 @@ static void test_connection_failure(void) InternetCloseHandle(session); } +static void test_default_service_port(void) +{ + HINTERNET session, connect, request; + DWORD error; + BOOL ret; + + session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(session != NULL, "InternetOpen failed\n"); + + connect = InternetConnect(session, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequest(connect, NULL, "/", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + error = GetLastError(); + ok(!ret, "HttpSendRequest succeeded\n"); + ok(error == ERROR_INTERNET_SECURITY_CHANNEL_ERROR || error == ERROR_INTERNET_CANNOT_CONNECT, + "got %u\n", error); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void init_status_tests(void) { memset(expect, 0, sizeof(expect)); @@ -4091,4 +4119,5 @@ START_TEST(http) HttpSendRequestEx_test(); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[3]); test_connection_failure(); + test_default_service_port(); }

1 0

Jacek Caban : jscript: Reimplemented do_attribute_tag_format without direct access to object' s string buffer.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 6eaef96dad12fb4aaec5044421941f3cd7ddb44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaef96dad12fb4aaec504442… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 6 12:39:38 2013 +0100 jscript: Reimplemented do_attribute_tag_format without direct access to object's string buffer. --- dlls/jscript/string.c | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 6235b51..8f38621 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -186,14 +186,11 @@ static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, j } static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsigned argc, jsval_t *argv, jsval_t *r, - const WCHAR *tagname, const WCHAR *attr) + const WCHAR *tagname, const WCHAR *attrname) { - static const WCHAR tagfmtW[] - = {'<','%','s',' ','%','s','=','\"','%','s','\"','>','%','s','<','/','%','s','>',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; jsstr_t *str, *attr_value = NULL; - const WCHAR *attr_str; unsigned attr_len; HRESULT hres; @@ -207,19 +204,45 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig jsstr_release(str); return hres; } - attr_str = attr_value->str; attr_len = jsstr_length(attr_value); }else { - attr_str = undefinedW; attr_len = sizeof(undefinedW)/sizeof(WCHAR)-1; } if(r) { + unsigned attrname_len = strlenW(attrname); + unsigned tagname_len = strlenW(tagname); jsstr_t *ret; - ret = jsstr_alloc_buf(2*strlenW(tagname) + strlenW(attr) + attr_len + jsstr_length(str) + 9); + ret = jsstr_alloc_buf(2*tagname_len + attrname_len + attr_len + jsstr_length(str) + 9); if(ret) { - sprintfW(ret->str, tagfmtW, tagname, attr, attr_str, str->str, tagname); + WCHAR *ptr = ret->str; + + *ptr++ = '<'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr++ = ' '; + memcpy(ptr, attrname, attrname_len*sizeof(WCHAR)); + ptr += attrname_len; + *ptr++ = '='; + *ptr++ = '"'; + + if(attr_value) + jsstr_flush(attr_value, ptr); + else + memcpy(ptr, undefinedW, attr_len*sizeof(WCHAR)); + ptr += attr_len; + + *ptr++ = '"'; + *ptr++ = '>'; + ptr += jsstr_flush(str, ptr); + + *ptr++ = '<'; + *ptr++ = '/'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr = '>'; + *r = jsval_string(ret); }else { hres = E_OUTOFMEMORY;

1 0

Jacek Caban : jscript: Reimplemented do_attributeless_tag_format without direct access to object' s string buffer.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 25dbf32b5d60937afafe6d2f7be7a910b6bcefc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dbf32b5d60937afafe6d2f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 6 12:39:27 2013 +0100 jscript: Reimplemented do_attributeless_tag_format without direct access to object's string buffer. --- dlls/jscript/string.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 1d4a188..6235b51 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -144,27 +144,44 @@ static HRESULT String_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r, const WCHAR *tagname) { - jsstr_t *str; + unsigned tagname_len; + jsstr_t *str, *ret; + WCHAR *ptr; HRESULT hres; - static const WCHAR tagfmt[] = {'<','%','s','>','%','s','<','/','%','s','>',0}; - hres = get_string_val(ctx, jsthis, &str); if(FAILED(hres)) return hres; - if(r) { - jsstr_t *ret = jsstr_alloc_buf(jsstr_length(str) + 2*strlenW(tagname) + 5); - if(!ret) { - jsstr_release(str); - return E_OUTOFMEMORY; - } + if(!r) { + jsstr_release(str); + return S_OK; + } - sprintfW(ret->str, tagfmt, tagname, str->str, tagname); - *r = jsval_string(ret); + tagname_len = strlenW(tagname); + + ret = jsstr_alloc_buf(jsstr_length(str) + 2*tagname_len + 5); + if(!ret) { + jsstr_release(str); + return E_OUTOFMEMORY; } + ptr = ret->str; + *ptr++ = '<'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr++ = '>'; + + ptr += jsstr_flush(str, ptr); jsstr_release(str); + + *ptr++ = '<'; + *ptr++ = '/'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr = '>'; + + *r = jsval_string(ret); return S_OK; }

1 0

Alexandre Julliard : vbscript: Return after assert(0) to silence warnings.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 72226ea8df753b4432b3a5f4b0d8350b51162624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72226ea8df753b4432b3a5f4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 14:09:47 2013 +0100 vbscript: Return after assert(0) to silence warnings. --- dlls/vbscript/compile.c | 1 + dlls/vbscript/global.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 58494b9..fb1974b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1400,6 +1400,7 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d break; default: assert(0); + return E_FAIL; } assert(!desc->entries[invoke_type]); diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9ff1f76..9c9cd41 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1012,6 +1012,7 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA return E_NOTIMPL; default: assert(0); + return E_FAIL; } if(startv) {

1 0

Alexandre Julliard : server: Use socklen_t where appropriate.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 9fdf7bc7715b9b00846d8f0b451533906a131eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fdf7bc7715b9b00846d8f0b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 13:40:38 2013 +0100 server: Use socklen_t where appropriate. --- server/request.c | 2 +- server/sock.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/request.c b/server/request.c index eeb3476..e075212 100644 --- a/server/request.c +++ b/server/request.c @@ -537,7 +537,7 @@ static void master_socket_poll_event( struct fd *fd, int event ) else if (event & POLLIN) { struct sockaddr_un dummy; - unsigned int len = sizeof(dummy); + socklen_t len = sizeof(dummy); int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len ); if (client == -1) return; fcntl( client, F_SETFL, O_NONBLOCK ); diff --git a/server/sock.c b/server/sock.c index 7dcc101..ba18a66 100644 --- a/server/sock.c +++ b/server/sock.c @@ -285,9 +285,9 @@ static void sock_wake_up( struct sock *sock ) static inline int sock_error( struct fd *fd ) { - unsigned int optval = 0, optlen; + unsigned int optval = 0; + socklen_t optlen = sizeof(optval); - optlen = sizeof(optval); getsockopt( get_unix_fd(fd), SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen); return optval; } @@ -667,7 +667,7 @@ static int accept_new_fd( struct sock *sock ) */ int acceptfd; struct sockaddr saddr; - unsigned int slen = sizeof(saddr); + socklen_t slen = sizeof(saddr); acceptfd = accept( get_unix_fd(sock->fd), &saddr, &slen); if (acceptfd == -1) {

1 0

Dmitry Timoshkov : windowscodecs: Add a comment to PNG decoder that Windows ignores CRC of the chunks.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: f18439da5102eafe4ba2b79bf7399e3c7d79d93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18439da5102eafe4ba2b79bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 6 16:29:20 2013 +0900 windowscodecs: Add a comment to PNG decoder that Windows ignores CRC of the chunks. --- dlls/windowscodecs/pngformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index e4236e2..fb8bf51 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -76,7 +76,7 @@ static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *d return hr; } - /* FIXME: Verify the CRC? */ + /* Windows ignores CRC of the chunk */ } return S_OK;

1 0

Dmitry Timoshkov : windowscodecs: Add a test for palette of a PNG image with PLTE and tRNS chunks.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: b0e8a18a5d09a0e19a662b2e9d606fe172ca8422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e8a18a5d09a0e19a662b2e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 6 16:28:56 2013 +0900 windowscodecs: Add a test for palette of a PNG image with PLTE and tRNS chunks. --- dlls/windowscodecs/tests/pngformat.c | 54 ++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index b21f5f7..61c56b3 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -534,6 +534,59 @@ static void test_color_contexts(void) IWICBitmapDecoder_Release(decoder); } +/* 1 bpp 1x1 pixel PNG image with PLTE and tRNS chunks */ +static const char png_PLTE_tRNS[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x01,0x03,0x00,0x00,0x00,0x25,0xdb,0x56,0xca, + 0x00,0x00,0x00,0x06,'P','L','T','E',0x01,0x02,0x03,0x04,0x05,0x06,0x95,0x53,0x6f,0x48, + 0x00,0x00,0x00,0x02,'t','R','N','S',0xff,0x00,0xe5,0xb7,0x30,0x4a, + 0x00,0x00,0x00,0x0a,'I','D','A','T',0x18,0xd3,0x63,0x68,0x00,0x00,0x00,0x82,0x00,0x81,0xa7,0x01,0xba,0x10, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static void test_png_palette(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + decoder = create_decoder(png_PLTE_tRNS, sizeof(png_PLTE_tRNS)); + ok(decoder != 0, "Failed to load PNG image data\n"); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat1bppIndexed), + "got wrong format %s\n", debugstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 256, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); +todo_wine + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); +todo_wine + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(pngformat) { HRESULT hr; @@ -545,6 +598,7 @@ START_TEST(pngformat) if (FAILED(hr)) return; test_color_contexts(); + test_png_palette(); IWICImagingFactory_Release(factory); CoUninitialize();

1 0

Ken Thomases : winemac: Implement WGL_NV_render_texture_rectangle.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 9c29be680c58bc8359d4d72b3f4e30f8dda38c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c29be680c58bc8359d4d72b3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:30 2013 -0600 winemac: Implement WGL_NV_render_texture_rectangle. --- dlls/winemac.drv/opengl.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 3b60a5c..c62db1a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1705,10 +1705,13 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, case WGL_DRAW_TO_PBUFFER_ARB: case WGL_BIND_TO_TEXTURE_RGB_ARB: case WGL_BIND_TO_TEXTURE_RGBA_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV: if (valid.pbuffer && (!pf.pbuffer != !value)) goto cant_match; pf.pbuffer = (value != 0); valid.pbuffer = 1; - if (attr == WGL_BIND_TO_TEXTURE_RGBA_ARB && !alpha_bits) + if ((attr == WGL_BIND_TO_TEXTURE_RGBA_ARB || attr == WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV) && + !alpha_bits) alpha_bits = 1; break; @@ -1859,6 +1862,10 @@ static struct wgl_pbuffer *macdrv_wglCreatePbufferARB(HDC hdc, int iPixelFormat, TRACE("WGL_TEXTURE_TARGET_ARB: WGL_TEXTURE_2D_ARB\n"); target = GL_TEXTURE_2D; break; + case WGL_TEXTURE_RECTANGLE_NV: + TRACE("WGL_TEXTURE_TARGET_ARB: WGL_TEXTURE_RECTANGLE_NV\n"); + target = GL_TEXTURE_RECTANGLE; + break; default: WARN("unknown WGL_TEXTURE_TARGET_ARB value 0x%x\n", value); SetLastError(ERROR_INVALID_DATA); @@ -2244,10 +2251,12 @@ static BOOL macdrv_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int i case WGL_DRAW_TO_PBUFFER_ARB: case WGL_BIND_TO_TEXTURE_RGB_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV: piValues[i] = pf->pbuffer ? GL_TRUE : GL_FALSE; break; case WGL_BIND_TO_TEXTURE_RGBA_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV: piValues[i] = (pf->pbuffer && color_modes[pf->color_mode].alpha_bits) ? GL_TRUE : GL_FALSE; break; @@ -2490,9 +2499,11 @@ static BOOL macdrv_wglQueryPbufferARB(struct wgl_pbuffer *pbuffer, int iAttribut *piValue = WGL_TEXTURE_CUBE_MAP_ARB; break; case GL_TEXTURE_2D: + *piValue = WGL_TEXTURE_2D_ARB; + break; case GL_TEXTURE_RECTANGLE: default: - *piValue = WGL_TEXTURE_2D_ARB; + *piValue = WGL_TEXTURE_RECTANGLE_NV; break; } break; @@ -2726,6 +2737,10 @@ static void load_extensions(void) opengl_funcs.ext.p_wglBindTexImageARB = macdrv_wglBindTexImageARB; opengl_funcs.ext.p_wglReleaseTexImageARB = macdrv_wglReleaseTexImageARB; opengl_funcs.ext.p_wglSetPbufferAttribARB = macdrv_wglSetPbufferAttribARB; + + if (gluCheckExtension((GLubyte*)"GL_ARB_texture_rectangle", (GLubyte*)gl_info.glExtensions) || + gluCheckExtension((GLubyte*)"GL_EXT_texture_rectangle", (GLubyte*)gl_info.glExtensions)) + register_extension("WGL_NV_render_texture_rectangle"); } /* TODO:

1 0

Alessandro Pignotti : strmbase: Frame scheduling should use IMediaSample:: GetTime.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 0029bbcf484a9e4b3f94ada84d4cc9e002b53cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0029bbcf484a9e4b3f94ada84… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Mar 5 16:13:43 2013 +0100 strmbase: Frame scheduling should use IMediaSample::GetTime. --- dlls/strmbase/renderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1f950f9..8bbb1f8 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -371,7 +371,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp } /* Wait for render Time */ - if (SUCCEEDED(IMediaSample_GetMediaTime(pSample, &start, &stop))) + if (SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) { hr = S_FALSE; RendererPosPassThru_RegisterMediaTime(This->pPosition, start);

1 0

Alexandre Julliard : winedbg: Use socklen_t where appropriate.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 51947acd5abb07209a8929ab639c1016a733e828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51947acd5abb07209a8929ab6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 14:09:24 2013 +0100 winedbg: Use socklen_t where appropriate. --- programs/winedbg/gdbproxy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 580fb88..66ff6a8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -476,6 +476,7 @@ static inline DWORD64 cpu_register(CONTEXT* ctx, unsigned idx) default: fprintf(stderr, "got unexpected size: %u\n", (unsigned)cpu_register_map[idx].ctx_length); assert(0); + return 0; } } @@ -2363,7 +2364,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl { int sock; struct sockaddr_in s_addrs; - unsigned int s_len = sizeof(s_addrs); + socklen_t s_len = sizeof(s_addrs); struct pollfd pollfd; IMAGEHLP_MODULE64 imh_mod; BOOL ret = FALSE;

1 0

Alexandre Julliard : ws2_32: Use socklen_t where appropriate.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: cfed5aa16c97871ad8454856877caabebfc6e174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfed5aa16c97871ad84548568… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 13:26:59 2013 +0100 ws2_32: Use socklen_t where appropriate. --- dlls/ws2_32/socket.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6fd1e34..05c7aac 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -985,9 +985,8 @@ static char *strdup_lower(const char *str) static inline int sock_error_p(int s) { - unsigned int optval, optlen; - - optlen = sizeof(optval); + unsigned int optval; + socklen_t optlen = sizeof(optval); getsockopt(s, SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen); if (optval) WARN("\t[%i] error: %d\n", s, optval); return optval != 0; @@ -999,7 +998,7 @@ static inline int sock_error_p(int s) static inline int get_rcvsnd_timeo( int fd, int optname) { struct timeval tv; - unsigned int len = sizeof(tv); + socklen_t len = sizeof(tv); int ret = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); if( ret >= 0) ret = tv.tv_sec * 1000 + tv.tv_usec / 1000; @@ -1777,7 +1776,7 @@ static int WS2_send( int fd, struct ws2_async *wsa ) { struct sockaddr_ipx* uipx = (struct sockaddr_ipx*)hdr.msg_name; int val=0; - unsigned int len=sizeof(int); + socklen_t len = sizeof(int); /* The packet type is stored at the ipx socket level; At least the linux kernel seems * to do something with it in case hdr.msg_name is NULL. Nonetheless can we use it to store @@ -2148,7 +2147,8 @@ static int WINAPI WS2_WSARecvMsg( SOCKET s, LPWSAMSG msg, LPDWORD lpNumberOfByte static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) { struct sockaddr_in *in_sock = (struct sockaddr_in *) addr; - unsigned int sock_type = 0, optlen = sizeof(sock_type); + unsigned int sock_type = 0; + socklen_t optlen = sizeof(sock_type); in_addr_t bind_addr = in_sock->sin_addr.s_addr; PIP_ADAPTER_INFO adapters = NULL, adapter; BOOL ret = FALSE; @@ -2523,7 +2523,7 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) if (fd != -1) { union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = sizeof(uaddr); + socklen_t uaddrlen = sizeof(uaddr); if (getpeername(fd, &uaddr.addr, &uaddrlen) == 0) { @@ -2565,7 +2565,7 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) if (fd != -1) { union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = sizeof(uaddr); + socklen_t uaddrlen = sizeof(uaddr); if (getsockname(fd, &uaddr.addr, &uaddrlen) != 0) { @@ -2622,7 +2622,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -2633,7 +2633,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_DONTLINGER: { struct linger lingval; - unsigned int len = sizeof(struct linger); + socklen_t len = sizeof(struct linger); if (!optlen || *optlen < sizeof(BOOL)|| !optval) { @@ -2695,7 +2695,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, { struct linger lingval; int so_type; - unsigned int len = sizeof(struct linger), slen = sizeof(int); + socklen_t len = sizeof(struct linger), slen = sizeof(int); /* struct linger and LINGER have different sizes */ if (!optlen || *optlen < sizeof(LINGER) || !optval) @@ -2759,7 +2759,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, #if defined(SO_RCVTIMEO) || defined(SO_SNDTIMEO) { struct timeval tv; - unsigned int len = sizeof(struct timeval); + socklen_t len = sizeof(struct timeval); if (!optlen || *optlen < sizeof(int)|| !optval) { @@ -2802,7 +2802,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case IPX_PTYPE: if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; #ifdef SOL_IPX - if(getsockopt(fd, SOL_IPX, IPX_TYPE, optval, (unsigned int*)optlen) == -1) + if(getsockopt(fd, SOL_IPX, IPX_TYPE, optval, (socklen_t *)optlen) == -1) { ret = SOCKET_ERROR; } @@ -2931,7 +2931,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -2965,7 +2965,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -3000,7 +3000,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -3245,7 +3245,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIOCATMARK: { - unsigned int oob = 0, oobsize = sizeof(int), atmark = 0; + unsigned int oob = 0, atmark = 0; + socklen_t oobsize = sizeof(int); if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) { WSASetLastError(WSAEFAULT);

1 0

Ken Thomases : winemac: Implement WGL_EXT_swap_control.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: 3f807e7a1a59aa62c626142f7f98e40d11008056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f807e7a1a59aa62c626142f7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:35 2013 -0600 winemac: Implement WGL_EXT_swap_control. --- dlls/winemac.drv/opengl.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index c62db1a..0f62e28 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2327,6 +2327,31 @@ static BOOL macdrv_wglGetPixelFormatAttribfvARB(HDC hdc, int iPixelFormat, int i } +/********************************************************************** + * macdrv_wglGetSwapIntervalEXT + * + * WGL_EXT_swap_control: wglGetSwapIntervalEXT + */ +static int macdrv_wglGetSwapIntervalEXT(void) +{ + struct wgl_context *context = NtCurrentTeb()->glContext; + long value; + CGLError err; + + TRACE("\n"); + + err = CGLGetParameter(context->cglcontext, kCGLCPSwapInterval, (GLint*)&value); + if (err != kCGLNoError) + { + WARN("CGLGetParameter(kCGLCPSwapInterval) failed; error %d %s\n", + err, CGLErrorString(err)); + value = 1; + } + + return value; +} + + /*********************************************************************** * macdrv_wglMakeContextCurrentARB * @@ -2686,6 +2711,42 @@ static BOOL macdrv_wglSetPixelFormatWINE(HDC hdc, int fmt) } +/********************************************************************** + * macdrv_wglSwapIntervalEXT + * + * WGL_EXT_swap_control: wglSwapIntervalEXT + */ +static BOOL macdrv_wglSwapIntervalEXT(int interval) +{ + struct wgl_context *context = NtCurrentTeb()->glContext; + long value; + CGLError err; + + TRACE("interval %d\n", interval); + + if (interval < 0) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + if (interval > 1) + interval = 1; + + value = interval; + err = CGLSetParameter(context->cglcontext, kCGLCPSwapInterval, (GLint*)&value); + if (err != kCGLNoError) + { + WARN("CGLSetParameter(kCGLCPSwapInterval) failed; error %d %s\n", + err, CGLErrorString(err)); + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + + return TRUE; +} + + static void register_extension(const char *ext) { if (gl_info.wglExtensions[0]) @@ -2754,6 +2815,10 @@ static void load_extensions(void) register_extension("WGL_EXT_extensions_string"); opengl_funcs.ext.p_wglGetExtensionsStringEXT = macdrv_wglGetExtensionsStringEXT; + register_extension("WGL_EXT_swap_control"); + opengl_funcs.ext.p_wglSwapIntervalEXT = macdrv_wglSwapIntervalEXT; + opengl_funcs.ext.p_wglGetSwapIntervalEXT = macdrv_wglGetSwapIntervalEXT; + /* Presumably identical to [W]GL_ARB_framebuffer_sRGB, above, but clients may check for either, so register them separately. */ if (gluCheckExtension((GLubyte*)"GL_EXT_framebuffer_sRGB", (GLubyte*)gl_info.glExtensions))

1 0

Ken Thomases : winemac: Implement WGL_ARB_pbuffer.
by Alexandre Julliard March 6, 2013

March 6, 2013

Module: wine Branch: master Commit: be7231bea37b058b5d58325026fb264b04db325a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7231bea37b058b5d5832502… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 04:59:21 2013 -0600 winemac: Implement WGL_ARB_pbuffer. --- dlls/winemac.drv/opengl.c | 336 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 321 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be7231bea37b058b5d583…

1 0