February 2014 - Wine-commits

Dmitry Timoshkov : taskschd: Return appropriate error code for a malformed XML.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 4c08276e6b88312bf2366c45a52853fc159fe1dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c08276e6b88312bf2366c45a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 25 12:22:36 2014 +0900 taskschd: Return appropriate error code for a malformed XML. --- dlls/taskschd/task.c | 8 ++++---- dlls/taskschd/tests/scheduler.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7dd9f04..41ff843 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1916,7 +1916,7 @@ static HRESULT read_settings(IXmlReader *reader, ITaskSettings *taskset) } WARN("Settings was not terminated\n"); - return E_FAIL; + return SCHED_E_MALFORMEDXML; } static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *info) @@ -1981,7 +1981,7 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf } WARN("RegistrationInfo was not terminated\n"); - return E_FAIL; + return SCHED_E_MALFORMEDXML; } static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef) @@ -2119,7 +2119,7 @@ static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) } WARN("Task was not terminated\n"); - return E_FAIL; + return SCHED_E_MALFORMEDXML; } static HRESULT read_xml(IXmlReader *reader, ITaskDefinition *taskdef) @@ -2165,7 +2165,7 @@ static HRESULT read_xml(IXmlReader *reader, ITaskDefinition *taskdef) } WARN("Task definition was not found\n"); - return E_FAIL; + return SCHED_E_MALFORMEDXML; } static HRESULT WINAPI TaskDefinition_put_XmlText(ITaskDefinition *iface, BSTR xml) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 4aad408..5720a7f 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1153,8 +1153,12 @@ static void test_TaskDefinition(void) static const char xml6[] = "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" " <RegistrationInfo/>\n" - " <Settings/>\n" " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + " <Settings>\n" "</Task>\n"; static const char xml7[] = "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" @@ -1241,13 +1245,16 @@ todo_wine MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine ok(hr == SCHED_E_MALFORMEDXML, "expected SCHED_E_MALFORMEDXML, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml7, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == SCHED_E_INVALIDVALUE, "expected SCHED_E_INVALIDVALUE, got %#x\n", hr); + xmlW[0] = 0; + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); + ok(hr == SCHED_E_MALFORMEDXML, "expected SCHED_E_MALFORMEDXML, got %#x\n", hr); + ITaskDefinition_Release(taskdef); ITaskService_Release(service); }

1 0

Nikolay Sivov : oleaut32: Propagate return codes properly.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 4c02dc867f4c56551605bfb646b29d1f30b3e1bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c02dc867f4c56551605bfb64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 25 08:42:49 2014 +0400 oleaut32: Propagate return codes properly. --- dlls/oleaut32/safearray.c | 64 ++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 4801f3b..080921e 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -186,7 +186,7 @@ static HRESULT SAFEARRAY_AllocDescriptor(ULONG ulSize, SAFEARRAY **ppsaOut) if (!ptr) { *ppsaOut = NULL; - return E_UNEXPECTED; + return E_OUTOFMEMORY; } *ppsaOut = (SAFEARRAY*)(ptr + SAFEARRAY_HIDDEN_SIZE); @@ -478,6 +478,7 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) HRESULT WINAPI SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut) { LONG allocSize; + HRESULT hr; TRACE("(%d,%p)\n", cDims, ppsaOut); @@ -490,8 +491,9 @@ HRESULT WINAPI SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut) /* We need enough space for the header and its bounds */ allocSize = sizeof(SAFEARRAY) + sizeof(SAFEARRAYBOUND) * (cDims - 1); - if (FAILED(SAFEARRAY_AllocDescriptor(allocSize, ppsaOut))) - return E_UNEXPECTED; + hr = SAFEARRAY_AllocDescriptor(allocSize, ppsaOut); + if (FAILED(hr)) + return hr; (*ppsaOut)->cDims = cDims; @@ -521,7 +523,7 @@ HRESULT WINAPI SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut) HRESULT WINAPI SafeArrayAllocDescriptorEx(VARTYPE vt, UINT cDims, SAFEARRAY **ppsaOut) { ULONG cbElements; - HRESULT hRet = E_UNEXPECTED; + HRESULT hRet; TRACE("(%d->%s,%d,%p)\n", vt, debugstr_vt(vt), cDims, ppsaOut); @@ -1129,18 +1131,17 @@ UINT WINAPI SafeArrayGetElemsize(SAFEARRAY *psa) */ HRESULT WINAPI SafeArrayAccessData(SAFEARRAY *psa, void **ppvData) { + HRESULT hr; + TRACE("(%p,%p)\n", psa, ppvData); if(!psa || !ppvData) return E_INVALIDARG; - if (SUCCEEDED(SafeArrayLock(psa))) - { - *ppvData = psa->pvData; - return S_OK; - } - *ppvData = NULL; - return E_UNEXPECTED; + hr = SafeArrayLock(psa); + *ppvData = SUCCEEDED(hr) ? psa->pvData : NULL; + + return hr; } @@ -1249,6 +1250,8 @@ HRESULT WINAPI SafeArrayPtrOfIndex(SAFEARRAY *psa, LONG *rgIndices, void **ppvDa */ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa) { + HRESULT hr; + TRACE("(%p)\n", psa); if (!psa) @@ -1258,8 +1261,9 @@ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa) return DISP_E_ARRAYISLOCKED; /* Can't delete a locked array */ /* Delete the actual item data */ - if (FAILED(SAFEARRAY_DestroyData(psa, 0))) - return E_UNEXPECTED; + hr = SAFEARRAY_DestroyData(psa, 0); + if (FAILED(hr)) + return hr; if (psa->pvData) { @@ -1388,9 +1392,9 @@ HRESULT WINAPI SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut) if (psa->fFeatures & (FADF_RECORD|FADF_HAVEIID|FADF_HAVEVARTYPE)) { VARTYPE vt; - if (FAILED(SafeArrayGetVartype(psa, &vt))) - hRet = E_UNEXPECTED; - else + + hRet = SafeArrayGetVartype(psa, &vt); + if (SUCCEEDED(hRet)) hRet = SafeArrayAllocDescriptorEx(vt, psa->cDims, ppsaOut); } else @@ -1409,19 +1413,23 @@ HRESULT WINAPI SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut) memcpy((*ppsaOut)->rgsabound, psa->rgsabound, psa->cDims * sizeof(SAFEARRAYBOUND)); (*ppsaOut)->pvData = SAFEARRAY_Malloc(SAFEARRAY_GetCellCount(psa) * psa->cbElements); - - if ((*ppsaOut)->pvData) + if (!(*ppsaOut)->pvData) { - hRet = SAFEARRAY_CopyData(psa, *ppsaOut); - - if (SUCCEEDED(hRet)) - return hRet; + SafeArrayDestroyDescriptor(*ppsaOut); + *ppsaOut = NULL; + return E_OUTOFMEMORY; + } + hRet = SAFEARRAY_CopyData(psa, *ppsaOut); + if (FAILED(hRet)) + { SAFEARRAY_Free((*ppsaOut)->pvData); + SafeArrayDestroyDescriptor(*ppsaOut); + *ppsaOut = NULL; + return hRet; } - SafeArrayDestroyDescriptor(*ppsaOut); } - *ppsaOut = NULL; + return hRet; } @@ -1444,6 +1452,7 @@ HRESULT WINAPI SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut) HRESULT WINAPI SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psabound) { SAFEARRAYBOUND *oldBounds; + HRESULT hr; TRACE("(%p,%p)\n", psa, psabound); @@ -1453,8 +1462,9 @@ HRESULT WINAPI SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psabound) if (psa->cLocks > 0) return DISP_E_ARRAYISLOCKED; - if (FAILED(SafeArrayLock(psa))) - return E_UNEXPECTED; + hr = SafeArrayLock(psa); + if (FAILED(hr)) + return hr; oldBounds = psa->rgsabound; oldBounds->lLbound = psabound->lLbound; @@ -1487,7 +1497,7 @@ HRESULT WINAPI SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psabound) if (!(pvNewData = SAFEARRAY_Malloc(ulNewSize))) { SafeArrayUnlock(psa); - return E_UNEXPECTED; + return E_OUTOFMEMORY; } memcpy(pvNewData, psa->pvData, ulOldSize);

1 0

Nikolay Sivov : oleaut32: Fix SafeArrayGetElement() for FADF_RECORD arrays.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 2ce06e57278ae749dc14400f7788f7438ef9f60a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce06e57278ae749dc14400f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 25 08:43:06 2014 +0400 oleaut32: Fix SafeArrayGetElement() for FADF_RECORD arrays. --- dlls/oleaut32/safearray.c | 24 ++++++++++++++++-------- dlls/oleaut32/tests/safearray.c | 6 ++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 080921e..99ffe27 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -990,18 +990,26 @@ HRESULT WINAPI SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData else *lpDest = NULL; } - else + else if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) { - if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) - { - LPUNKNOWN *lpUnknown = lpvSrc; + IUnknown **src_unk = lpvSrc; + IUnknown **dest_unk = pvData; - if (*lpUnknown) - IUnknown_AddRef(*lpUnknown); - } + if (*src_unk) + IUnknown_AddRef(*src_unk); + *dest_unk = *src_unk; + } + else if (psa->fFeatures & FADF_RECORD) + { + IRecordInfo *record; + + SafeArrayGetRecordInfo(psa, &record); + hRet = IRecordInfo_RecordCopy(record, lpvSrc, pvData); + IRecordInfo_Release(record); + } + else /* Copy the data over */ memcpy(pvData, lpvSrc, psa->cbElements); - } } SafeArrayUnlock(psa); } diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index c28931c..cc6a62c 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1203,6 +1203,12 @@ static void test_SafeArrayGetPutElement(void) ok(hres == S_OK, "got 0x%08x\n", hres); ok(irec->recordcopy == 1, "got %d\n", irec->recordcopy); + index = 0; + irec->recordcopy = 0; + hres = SafeArrayGetElement(sa, &index, (void*)0xdeadbeef); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(irec->recordcopy == 1, "got %d\n", irec->recordcopy); + hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); ok(irec->ref == 1, "got %d\n", irec->ref);

1 0

Nikolay Sivov : oleaut32: Use better naming to clarify copy direction.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: efa2905cf86009a12bd969ec98f42b5e16a7aa79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efa2905cf86009a12bd969ec9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 25 08:43:28 2014 +0400 oleaut32: Use better naming to clarify copy direction. --- dlls/oleaut32/recinfo.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 69c973c..02ba61f 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -266,20 +266,19 @@ static HRESULT WINAPI IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvEx return S_OK; } -static HRESULT WINAPI IRecordInfoImpl_RecordCopy(IRecordInfo *iface, PVOID pvExisting, - PVOID pvNew) +static HRESULT WINAPI IRecordInfoImpl_RecordCopy(IRecordInfo *iface, void *src_rec, void *dest_rec) { IRecordInfoImpl *This = impl_from_IRecordInfo(iface); HRESULT hr = S_OK; int i; - TRACE("(%p)->(%p %p)\n", This, pvExisting, pvNew); + TRACE("(%p)->(%p %p)\n", This, src_rec, dest_rec); - if(!pvExisting || !pvNew) + if(!src_rec || !dest_rec) return E_INVALIDARG; /* release already stored data */ - IRecordInfo_RecordClear(iface, pvNew); + IRecordInfo_RecordClear(iface, dest_rec); for (i = 0; i < This->n_vars; i++) { @@ -290,8 +289,8 @@ static HRESULT WINAPI IRecordInfoImpl_RecordCopy(IRecordInfo *iface, PVOID pvExi continue; } - src = ((BYTE*)pvExisting) + This->fields[i].offset; - dest = ((BYTE*)pvNew) + This->fields[i].offset; + src = ((BYTE*)src_rec) + This->fields[i].offset; + dest = ((BYTE*)dest_rec) + This->fields[i].offset; switch (This->fields[i].vt) { case VT_BSTR: @@ -333,7 +332,7 @@ static HRESULT WINAPI IRecordInfoImpl_RecordCopy(IRecordInfo *iface, PVOID pvExi } if (FAILED(hr)) - IRecordInfo_RecordClear(iface, pvNew); + IRecordInfo_RecordClear(iface, dest_rec); return hr; }

1 0

Nikolay Sivov : scrrun: Added IDrive stub and Next() for drive collection.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: b8e78f3234e127a00aae0a81fce66ea83e700216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e78f3234e127a00aae0a81f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 25 09:25:33 2014 +0400 scrrun: Added IDrive stub and Next() for drive collection. --- dlls/scrrun/filesystem.c | 305 +++++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 1 + dlls/scrrun/scrrun.idl | 4 +- dlls/scrrun/scrrun_private.h | 1 + 4 files changed, 305 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8e78f3234e127a00aae0…

1 0

Nikolay Sivov : scrrun: Implement DriveType property of IDrive.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 17c4c1bef53544e756dd8dc7ad93402749d5cf54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c4c1bef53544e756dd8dc7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 25 09:25:54 2014 +0400 scrrun: Implement DriveType property of IDrive. --- dlls/scrrun/filesystem.c | 30 +++++++++++++++++++++++++++--- dlls/scrrun/scrrun.idl | 12 ++++++------ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2e45809..70bc341 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -573,11 +573,35 @@ static HRESULT WINAPI drive_get_ShareName(IDrive *iface, BSTR *share_name) return E_NOTIMPL; } -static HRESULT WINAPI drive_get_DriveType(IDrive *iface, DriveTypeConst *ptype) +static HRESULT WINAPI drive_get_DriveType(IDrive *iface, DriveTypeConst *type) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, ptype); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, type); + + switch (GetDriveTypeW(This->root)) + { + case DRIVE_REMOVABLE: + *type = Removable; + break; + case DRIVE_FIXED: + *type = Fixed; + break; + case DRIVE_REMOTE: + *type = Remote; + break; + case DRIVE_CDROM: + *type = CDRom; + break; + case DRIVE_RAMDISK: + *type = RamDisk; + break; + default: + *type = UnknownType; + break; + } + + return S_OK; } static HRESULT WINAPI drive_get_RootFolder(IDrive *iface, IFolder **folder) diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index 91c6314..eec8743 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -92,12 +92,12 @@ library Scripting typedef enum DriveTypeConst { - UnknownType = 0, - Removable = 1, - Fixed = 2, - Remote = 3, - CDRom = 4, - RamDisk = 5 + UnknownType, + Removable, + Fixed, + Remote, + CDRom, + RamDisk } DriveTypeConst; typedef enum StandardStreamTypes

1 0

Piotr Caban : qcap: Fix Avi Mux IConfigInterleaving:: put_Mode implementation.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: cde81264e53710113e8337d799520b0af4d477e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde81264e53710113e8337d79… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 25 12:21:43 2014 +0100 qcap: Fix Avi Mux IConfigInterleaving::put_Mode implementation. --- dlls/qcap/avimux.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 626e144..79e6368 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -332,7 +332,6 @@ static HRESULT WINAPI ConfigInterleaving_put_Mode( IConfigInterleaving *iface, InterleavingMode mode) { AviMux *This = impl_from_IConfigInterleaving(iface); - HRESULT hr = S_OK; TRACE("(%p)->(%d)\n", This, mode); @@ -340,19 +339,16 @@ static HRESULT WINAPI ConfigInterleaving_put_Mode( return E_INVALIDARG; if(This->mode != mode) { - int i; - - for(i=0; i<This->input_pin_no; i++) { - if(!This->in[i]->pin.pin.pConnectedTo) - continue; - - hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, &This->in[i]->pin.pin.IPin_iface); - if(FAILED(hr)) - return hr; + if(This->out->pin.pin.pConnectedTo) { + HRESULT hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, + &This->out->pin.pin.IPin_iface); + if(FAILED(hr)) + return hr; } + + This->mode = mode; } - This->mode = mode; return S_OK; }

1 0

Piotr Caban : qcap: Add Avi Mux IConfigInterleaving:: put_Interleaving implementation.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: e32a9afe65d042d2972da95dd603c6bf0acb0412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32a9afe65d042d2972da95dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 25 12:21:59 2014 +0100 qcap: Add Avi Mux IConfigInterleaving::put_Interleaving implementation. --- dlls/qcap/avimux.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 79e6368..4b3a443 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -55,6 +55,9 @@ typedef struct { ISpecifyPropertyPages ISpecifyPropertyPages_iface; InterleavingMode mode; + REFERENCE_TIME interleave; + REFERENCE_TIME preroll; + AviMuxOut *out; int input_pin_no; AviMuxIn *in[MAX_PIN_NO-1]; @@ -364,8 +367,14 @@ static HRESULT WINAPI ConfigInterleaving_put_Interleaving(IConfigInterleaving *i const REFERENCE_TIME *prtInterleave, const REFERENCE_TIME *prtPreroll) { AviMux *This = impl_from_IConfigInterleaving(iface); - FIXME("(%p)->(%p %p)\n", This, prtInterleave, prtPreroll); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, prtInterleave, prtPreroll); + + if(prtInterleave) + This->interleave = *prtInterleave; + if(prtPreroll) + This->preroll = *prtPreroll; + return S_OK; } static HRESULT WINAPI ConfigInterleaving_get_Interleaving(IConfigInterleaving *iface, @@ -1616,7 +1625,7 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) return NULL; } - avimux = HeapAlloc(GetProcessHeap(), 0, sizeof(AviMux)); + avimux = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AviMux)); if(!avimux) { *phr = E_OUTOFMEMORY; return NULL; @@ -1629,7 +1638,6 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) avimux->IMediaSeeking_iface.lpVtbl = &MediaSeekingVtbl; avimux->IPersistMediaPropertyBag_iface.lpVtbl = &PersistMediaPropertyBagVtbl; avimux->ISpecifyPropertyPages_iface.lpVtbl = &SpecifyPropertyPagesVtbl; - avimux->input_pin_no = 0; info.dir = PINDIR_OUTPUT; info.pFilter = &avimux->filter.IBaseFilter_iface; @@ -1653,6 +1661,8 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) return NULL; } + avimux->interleave = 10000000; + ObjectRefCount(TRUE); *phr = S_OK; return (IUnknown*)&avimux->filter.IBaseFilter_iface;

1 0

Piotr Caban : qcap: Add support for FORMAT_VideoInfo pins in AviMuxIn:: ReceiveConnection.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: b43dcc451577b5f582b126bdd621256571e2e714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43dcc451577b5f582b126bdd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 25 12:22:30 2014 +0100 qcap: Add support for FORMAT_VideoInfo pins in AviMuxIn::ReceiveConnection. --- dlls/qcap/avimux.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 4b3a443..20f830a 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "wtypes.h" #include "dshow.h" +#include "aviriff.h" #include "qcap_main.h" @@ -33,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); #define MAX_PIN_NO 128 +#define ALIGN(x) ((x+1)/2*2) typedef struct { BaseOutputPin pin; @@ -44,6 +46,14 @@ typedef struct { IAMStreamControl IAMStreamControl_iface; IPropertyBag IPropertyBag_iface; IQualityControl IQualityControl_iface; + + /* strl chunk */ + AVISTREAMHEADER strh; + struct { + FOURCC fcc; + DWORD cb; + BYTE data[1]; + } *strf; } AviMuxIn; typedef struct { @@ -1017,7 +1027,7 @@ static const IQualityControlVtbl AviMuxOut_QualityControlVtbl = { static HRESULT WINAPI AviMuxIn_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *pmt) { - FIXME("(%p:%s)->(AM_MEDIA_TYPE(%p))\n", base, debugstr_w(base->pinInfo.achName), pmt); + TRACE("(%p:%s)->(AM_MEDIA_TYPE(%p))\n", base, debugstr_w(base->pinInfo.achName), pmt); dump_AM_MEDIA_TYPE(pmt); if(IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio) && @@ -1143,6 +1153,32 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, if(FAILED(hr)) return hr; + if(IsEqualIID(&pmt->majortype, &MEDIATYPE_Video) && + IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { + VIDEOINFOHEADER *vih; + int size; + + vih = (VIDEOINFOHEADER*)pmt->pbFormat; + avimuxin->strh.fcc = ckidSTREAMHEADER; + avimuxin->strh.cb = sizeof(AVISTREAMHEADER) - FIELD_OFFSET(AVISTREAMHEADER, fccType); + avimuxin->strh.fccType = streamtypeVIDEO; + /* FIXME: fccHandler should be set differently */ + avimuxin->strh.fccHandler = vih->bmiHeader.biCompression ? + vih->bmiHeader.biCompression : FCC('D','I','B',' '); + + size = pmt->cbFormat - FIELD_OFFSET(VIDEOINFOHEADER, bmiHeader); + avimuxin->strf = CoTaskMemAlloc(sizeof(RIFFCHUNK) + ALIGN(FIELD_OFFSET(BITMAPINFO, bmiColors[iPALETTE_COLORS]))); + avimuxin->strf->fcc = ckidSTREAMFORMAT; + avimuxin->strf->cb = FIELD_OFFSET(BITMAPINFO, bmiColors[iPALETTE_COLORS]); + if(size > avimuxin->strf->cb) + size = avimuxin->strf->cb; + memcpy(avimuxin->strf->data, &vih->bmiHeader, size); + }else { + FIXME("format not supported: %s %s\n", debugstr_guid(&pmt->majortype), + debugstr_guid(&pmt->formattype)); + return E_NOTIMPL; + } + return create_input_pin(This); } @@ -1150,8 +1186,17 @@ static HRESULT WINAPI AviMuxIn_Disconnect(IPin *iface) { AviMux *This = impl_from_in_IPin(iface); AviMuxIn *avimuxin = AviMuxIn_from_IPin(iface); + HRESULT hr; + TRACE("(%p:%s)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName)); - return BasePinImpl_Disconnect(iface); + + hr = BasePinImpl_Disconnect(iface); + if(FAILED(hr)) + return hr; + + CoTaskMemFree(avimuxin->strf); + avimuxin->strf = NULL; + return hr; } static HRESULT WINAPI AviMuxIn_ConnectedTo(IPin *iface, IPin **pPin) @@ -1606,6 +1651,9 @@ static HRESULT create_input_pin(AviMux *avimux) return hr; } + memset(&avimux->in[avimux->input_pin_no]->strh, 0, sizeof(avimux->in[avimux->input_pin_no]->strh)); + avimux->in[avimux->input_pin_no]->strf = NULL; + avimux->input_pin_no++; return S_OK; }

1 0

Piotr Caban : qcap: Add partial Avi Mux IBaseFilter::Run implementation.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 053b1f6f60d666a4cd28f475f08576722eed1c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053b1f6f60d666a4cd28f475f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 25 12:22:53 2014 +0100 qcap: Add partial Avi Mux IBaseFilter::Run implementation. --- dlls/qcap/avimux.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 168 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 20f830a..dde634e 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "wtypes.h" #include "dshow.h" +#include "vfw.h" #include "aviriff.h" #include "qcap_main.h" @@ -34,11 +35,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); #define MAX_PIN_NO 128 +#define AVISUPERINDEX_ENTRIES 2000 +#define AVISTDINDEX_ENTRIES 4000 #define ALIGN(x) ((x+1)/2*2) typedef struct { BaseOutputPin pin; IQualityControl IQualityControl_iface; + + int movi_off; + int size; + IStream *stream; } AviMuxOut; typedef struct { @@ -47,6 +54,9 @@ typedef struct { IPropertyBag IPropertyBag_iface; IQualityControl IQualityControl_iface; + REFERENCE_TIME avg_time_per_frame; + int stream_id; + /* strl chunk */ AVISTREAMHEADER strh; struct { @@ -54,6 +64,13 @@ typedef struct { DWORD cb; BYTE data[1]; } *strf; + AVISUPERINDEX *indx; + BYTE indx_data[FIELD_OFFSET(AVISUPERINDEX, aIndex[AVISUPERINDEX_ENTRIES])]; + + /* movi chunk */ + int ix_off; + AVISTDINDEX *ix; + BYTE ix_data[FIELD_OFFSET(AVISTDINDEX, aIndex[AVISTDINDEX_ENTRIES])]; } AviMuxIn; typedef struct { @@ -71,6 +88,13 @@ typedef struct { AviMuxOut *out; int input_pin_no; AviMuxIn *in[MAX_PIN_NO-1]; + + REFERENCE_TIME start, stop; + AVIMAINHEADER avih; + + int idx1_entries; + int idx1_size; + AVIINDEXENTRY *idx1; } AviMux; static HRESULT create_input_pin(AviMux*); @@ -159,12 +183,33 @@ static ULONG WINAPI AviMux_Release(IBaseFilter *iface) for(i=0; i<This->input_pin_no; i++) BaseInputPinImpl_Release(&This->in[i]->pin.pin.IPin_iface); + HeapFree(GetProcessHeap(), 0, This->idx1); HeapFree(GetProcessHeap(), 0, This); ObjectRefCount(FALSE); } return ref; } +static inline HRESULT idx1_add_entry(AviMux *avimux, DWORD ckid, DWORD flags, DWORD off, DWORD len) +{ + if(avimux->idx1_entries == avimux->idx1_size) { + AVIINDEXENTRY *new_idx = HeapReAlloc(GetProcessHeap(), 0, avimux->idx1, + sizeof(*avimux->idx1)*2*avimux->idx1_size); + if(!new_idx) + return E_OUTOFMEMORY; + + avimux->idx1_size *= 2; + avimux->idx1 = new_idx; + } + + avimux->idx1[avimux->idx1_entries].ckid = ckid; + avimux->idx1[avimux->idx1_entries].dwFlags = flags; + avimux->idx1[avimux->idx1_entries].dwChunkOffset = off; + avimux->idx1[avimux->idx1_entries].dwChunkLength = len; + avimux->idx1_entries++; + return S_OK; +} + static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) { AviMux *This = impl_from_IBaseFilter(iface); @@ -182,8 +227,124 @@ static HRESULT WINAPI AviMux_Pause(IBaseFilter *iface) static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) { AviMux *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(0x%x%08x)\n", This, (ULONG)(tStart >> 32), (ULONG)tStart); - return E_NOTIMPL; + HRESULT hr; + int i, stream_id; + + TRACE("(%p)->(0x%x%08x)\n", This, (ULONG)(tStart >> 32), (ULONG)tStart); + + if(This->filter.state == State_Running) + return S_OK; + + if(This->mode != INTERLEAVE_FULL) { + FIXME("mode not supported (%d)\n", This->mode); + return E_NOTIMPL; + } + + if(tStart) + FIXME("tStart parameter ignored\n"); + + for(i=0; i<This->input_pin_no; i++) { + IMediaSeeking *ms; + LONGLONG cur, stop; + + if(!This->in[i]->pin.pin.pConnectedTo) + continue; + + hr = IPin_QueryInterface(This->in[i]->pin.pin.pConnectedTo, + &IID_IMediaSeeking, (void**)&ms); + if(FAILED(hr)) + continue; + + hr = IMediaSeeking_GetPositions(ms, &cur, &stop); + if(FAILED(hr)) { + IMediaSeeking_Release(ms); + continue; + } + + FIXME("Use IMediaSeeking to fill stream header\n"); + IMediaSeeking_Release(ms); + } + + if(This->out->pin.pMemInputPin) { + hr = IMemInputPin_QueryInterface(This->out->pin.pMemInputPin, + &IID_IStream, (void**)&This->out->stream); + if(FAILED(hr)) + return hr; + } + + This->idx1_entries = 0; + if(!This->idx1_size) { + This->idx1_size = 1024; + This->idx1 = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->idx1)*This->idx1_size); + if(!This->idx1) + return E_OUTOFMEMORY; + } + + This->out->size = 3*sizeof(RIFFLIST) + sizeof(AVIMAINHEADER) + sizeof(AVIEXTHEADER); + This->start = -1; + This->stop = -1; + memset(&This->avih, 0, sizeof(This->avih)); + for(i=0; i<This->input_pin_no; i++) { + if(!This->in[i]->pin.pin.pConnectedTo) + continue; + + This->avih.dwStreams++; + This->out->size += sizeof(RIFFLIST) + sizeof(AVISTREAMHEADER) + sizeof(RIFFCHUNK) + + This->in[i]->strf->cb + sizeof(This->in[i]->indx_data); + + This->in[i]->strh.dwScale = MulDiv(This->in[i]->avg_time_per_frame, This->interleave, 10000000); + This->in[i]->strh.dwRate = This->interleave; + + hr = IMemAllocator_Commit(This->in[i]->pin.pAllocator); + if(FAILED(hr)) { + if(This->out->stream) { + IStream_Release(This->out->stream); + This->out->stream = NULL; + } + return hr; + } + } + + This->out->movi_off = This->out->size; + This->out->size += sizeof(RIFFLIST); + + idx1_add_entry(This, FCC('7','F','x','x'), 0, This->out->movi_off+sizeof(RIFFLIST), 0); + + stream_id = 0; + for(i=0; i<This->input_pin_no; i++) { + if(!This->in[i]->pin.pin.pConnectedTo) + continue; + + This->in[i]->ix_off = This->out->size; + This->out->size += sizeof(This->in[i]->ix_data); + This->in[i]->ix->fcc = FCC('i','x','0'+stream_id/10,'0'+stream_id%10); + This->in[i]->ix->cb = sizeof(This->in[i]->ix_data) - sizeof(RIFFCHUNK); + This->in[i]->ix->wLongsPerEntry = 2; + This->in[i]->ix->bIndexSubType = 0; + This->in[i]->ix->bIndexType = AVI_INDEX_OF_CHUNKS; + This->in[i]->ix->dwChunkId = FCC('0'+stream_id/10,'0'+stream_id%10,'d','b'); + This->in[i]->ix->qwBaseOffset = 0; + + This->in[i]->indx->fcc = ckidAVISUPERINDEX; + This->in[i]->indx->cb = sizeof(This->in[i]->indx_data) - sizeof(RIFFCHUNK); + This->in[i]->indx->wLongsPerEntry = 4; + This->in[i]->indx->bIndexSubType = 0; + This->in[i]->indx->bIndexType = AVI_INDEX_OF_INDEXES; + This->in[i]->indx->dwChunkId = This->in[i]->ix->dwChunkId; + This->in[i]->stream_id = stream_id++; + } + + This->avih.fcc = ckidMAINAVIHEADER; + This->avih.cb = sizeof(AVIMAINHEADER) - sizeof(RIFFCHUNK); + /* TODO: Use first video stream */ + This->avih.dwMicroSecPerFrame = This->in[0]->avg_time_per_frame/10; + This->avih.dwPaddingGranularity = 1; + This->avih.dwFlags = AVIF_TRUSTCKTYPE | AVIF_HASINDEX; + This->avih.dwWidth = ((BITMAPINFOHEADER*)This->in[0]->strf->data)->biWidth; + This->avih.dwHeight = ((BITMAPINFOHEADER*)This->in[0]->strf->data)->biHeight; + + This->filter.state = State_Running; + return S_OK; } static HRESULT WINAPI AviMux_EnumPins(IBaseFilter *iface, IEnumPins **ppEnum) @@ -1653,6 +1814,10 @@ static HRESULT create_input_pin(AviMux *avimux) memset(&avimux->in[avimux->input_pin_no]->strh, 0, sizeof(avimux->in[avimux->input_pin_no]->strh)); avimux->in[avimux->input_pin_no]->strf = NULL; + memset(&avimux->in[avimux->input_pin_no]->indx_data, 0, sizeof(avimux->in[avimux->input_pin_no]->indx_data)); + memset(&avimux->in[avimux->input_pin_no]->ix_data, 0, sizeof(avimux->in[avimux->input_pin_no]->ix_data)); + avimux->in[avimux->input_pin_no]->indx = (AVISUPERINDEX*)&avimux->in[avimux->input_pin_no]->indx_data; + avimux->in[avimux->input_pin_no]->ix = (AVISTDINDEX*)avimux->in[avimux->input_pin_no]->ix_data; avimux->input_pin_no++; return S_OK; @@ -1699,6 +1864,7 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) return NULL; } avimux->out->IQualityControl_iface.lpVtbl = &AviMuxOut_QualityControlVtbl; + avimux->out->stream = NULL; hr = create_input_pin(avimux); if(FAILED(hr)) {

1 0