February 2014 - Wine-Commits

Frédéric Delanoy : avifil32: Use BOOL type where appropriate.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: b26c4391509e549a5dc6b80deaee41927aada74a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26c4391509e549a5dc6b80de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 25 00:05:33 2014 +0100 avifil32: Use BOOL type where appropriate. --- dlls/avifil32/wavfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index fd6d9ec..07f9b5e 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -958,7 +958,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, /* do we have anything to write? */ if (buffer != NULL && buffersize > 0) { - This->fDirty = 1; + This->fDirty = TRUE; if (mmioSeek(This->hmmio, This->ckData.dwDataOffset + start * This->sInfo.dwSampleSize, SEEK_SET) == -1) @@ -1021,7 +1021,7 @@ static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, return AVIERR_UNSUPPORTED; } - This->fDirty = 1; + This->fDirty = TRUE; return AVIERR_OK; } @@ -1225,7 +1225,7 @@ static HRESULT AVIFILE_LoadSunFile(IAVIFileImpl *This) This->lpFormat->nAvgBytesPerSec = This->lpFormat->nBlockAlign * This->lpFormat->nSamplesPerSec; - This->fDirty = 0; + This->fDirty = FALSE; This->sInfo.fccType = streamtypeAUDIO; This->sInfo.fccHandler = 0;

1 0

Francois Gouget : oleaut32/tests: Skip the test_stub() tests if we have insufficient privileges.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: 2e0d15b00722edd3dad1d627f3a5ab2617bb34cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0d15b00722edd3dad1d627f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 23:55:23 2014 +0100 oleaut32/tests: Skip the test_stub() tests if we have insufficient privileges. --- dlls/oleaut32/tests/typelib.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7adf064..f27a67f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5323,6 +5323,14 @@ static void test_stub(void) ok(hr == S_OK, "got %08x\n", hr); hr = RegisterTypeLib(tl, filenameW, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + ITypeLib_Release(tl); + DeleteFileW(filenameW); + CoUninitialize(); + return; + } ok(hr == S_OK, "got %08x\n", hr); ITypeLib_Release(tl);

1 0

Dmitry Timoshkov : taskschd/tests: Add more various tests.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: 1c778d91bdb07702665f2bae86d7c4a26a150e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c778d91bdb07702665f2bae8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 25 12:22:20 2014 +0900 taskschd/tests: Add more various tests. --- dlls/taskschd/task.c | 2 + dlls/taskschd/tests/scheduler.c | 136 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 133 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 8b73bf0..eb42d65 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -2173,6 +2173,8 @@ static HRESULT WINAPI TaskDefinition_put_XmlText(ITaskDefinition *iface, BSTR xm TRACE("%p,%s\n", iface, debugstr_w(xml)); + if (!xml) return E_INVALIDARG; + hmem = GlobalAlloc(0, lstrlenW(xml) * sizeof(WCHAR)); if (!hmem) return E_OUTOFMEMORY; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 35e6dc0..8187214 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -81,8 +81,8 @@ static void test_Connect(void) V_BSTR(&v_comp) = SysAllocString(deadbeefW); hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); -todo_wine - ok(hr == HRESULT_FROM_WIN32(RPC_S_INVALID_NET_ADDR), "expected RPC_S_INVALID_NET_ADDR, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(RPC_S_INVALID_NET_ADDR) || hr == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH) /* VM */, + "expected RPC_S_INVALID_NET_ADDR, got %#x\n", hr); SysFreeString(V_BSTR(&v_comp)); vbool = 0xdead; @@ -340,6 +340,10 @@ todo_wine ITaskFolder_Release(subfolder); + hr = ITaskFolder_DeleteFolder(folder, Wine, 0); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); + hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0); ok(hr == S_OK, "DeleteFolder error %#x\n", hr); ITaskFolder_DeleteFolder(folder, Wine_Folder1+1, 0); @@ -816,6 +820,15 @@ todo_wine ok(hr == S_OK, "get_Enabled error %#x\n", hr); ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); + hr = IRegisteredTask_put_Enabled(task1, VARIANT_TRUE); + ok(hr == S_OK, "put_Enabled error %#x\n", hr); + hr = IRegisteredTask_get_State(task1, &state); + ok(hr == S_OK, "get_State error %#x\n", hr); + ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); + hr = IRegisteredTask_get_Enabled(task1, &vbool); + ok(hr == S_OK, "get_Enabled error %#x\n", hr); + ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + IRegisteredTask_Release(task1); hr = ITaskFolder_GetTask(folder, Task2, &task2); @@ -1076,6 +1089,85 @@ todo_wine static void test_TaskDefinition(void) { + static const char xml1[] = + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo>\n" + " <Description>\"Task1\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>false</Enabled>\n" + " <Hidden>false</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; + static const char xml2[] = + "<Task>\n" + " <RegistrationInfo>\n" + " <Description>\"Task1\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>false</Enabled>\n" + " <Hidden>false</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; + static const char xml3[] = + "<TASK>\n" + " <RegistrationInfo>\n" + " <Description>\"Task1\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>false</Enabled>\n" + " <Hidden>false</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</TASK>\n"; + static const char xml4[] = + "<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" + "</Task>\n"; + static const char xml5[] = + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo/>\n" + " <Settings/>\n" + " <Actions/>\n" + "</Task>\n"; + static const char xml6[] = + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo/>\n" + " <Settings/>\n" + " <Actions>\n" + "</Task>\n"; + static const char xml7[] = + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo/>\n" + " <Settings>\n" + " <Enabled>FALSE</Enabled>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, VARIANT_TRUE, VARIANT_TRUE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_TRUE, VARIANT_FALSE, @@ -1085,10 +1177,10 @@ static void test_TaskDefinition(void) VARIANT_FALSE, VARIANT_FALSE, VARIANT_TRUE, VARIANT_TRUE, VARIANT_FALSE, VARIANT_TRUE, VARIANT_TRUE, VARIANT_TRUE }; HRESULT hr; - VARIANT v_null; ITaskService *service; ITaskDefinition *taskdef; BSTR xml; + WCHAR xmlW[sizeof(xml1)]; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if (hr != S_OK) @@ -1097,8 +1189,6 @@ static void test_TaskDefinition(void) return; } - V_VT(&v_null) = VT_NULL; - hr = ITaskService_NewTask(service, 0, &taskdef); ok(hr == S_OK, "NewTask error %#x\n", hr); @@ -1124,6 +1214,42 @@ static void test_TaskDefinition(void) test_settings_v1(taskdef, &new_settings, &def_settings); */ + hr = ITaskDefinition_put_XmlText(taskdef, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); + ok(hr == S_OK, "put_XmlText error %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); +todo_wine + ok(hr == SCHED_E_NAMESPACE, "expected SCHED_E_NAMESPACE, got %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); +todo_wine + ok(hr == SCHED_E_UNEXPECTEDNODE, "expected SCHED_E_UNEXPECTEDNODE, got %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); + ok(hr == S_OK, "put_XmlText error %#x\n", hr); + + MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskDefinition_put_XmlText(taskdef, xmlW); +todo_wine + ok(hr == SCHED_E_MISSINGNODE, "expected SCHED_E_MISSINGNODE, got %#x\n", hr); + + 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); +todo_wine + ok(hr == SCHED_E_INVALIDVALUE, "expected SCHED_E_INVALIDVALUE, got %#x\n", hr); + ITaskDefinition_Release(taskdef); ITaskService_Release(service); }

1 0

Dmitry Timoshkov : taskschd: Add a check for the task namespace.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: d2fc6b3145e41d05a81692eb0939bbadf694f5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fc6b3145e41d05a81692eb0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 25 12:22:25 2014 +0900 taskschd: Add a check for the task namespace. --- dlls/taskschd/task.c | 7 ++++++- dlls/taskschd/tests/scheduler.c | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index eb42d65..1288314 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1990,6 +1990,7 @@ static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef ITaskSettings *taskset; const WCHAR *name; const WCHAR *value; + BOOL xmlns_ok = FALSE; TRACE("\n"); @@ -2028,7 +2029,11 @@ static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef else if (!lstrcmpW(name, xmlns)) { if (lstrcmpW(value, task_ns)) + { FIXME("unknown namespace %s\n", debugstr_w(value)); + break; + } + xmlns_ok = TRUE; } else FIXME("unhandled Task attribute %s\n", debugstr_w(name)); @@ -2037,7 +2042,7 @@ static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef } ITaskSettings_Release(taskset); - return S_OK; + return xmlns_ok ? S_OK : SCHED_E_NAMESPACE; } static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 8187214..48d16dd 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1223,7 +1223,6 @@ static void test_TaskDefinition(void) MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine ok(hr == SCHED_E_NAMESPACE, "expected SCHED_E_NAMESPACE, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0]));

1 0

Dmitry Timoshkov : taskschd: Don' t accept task XML with an invalid boolean value.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: 39f0b276c782ea5a23fed6e3ff3b374b8a29f1df URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f0b276c782ea5a23fed6e3f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 25 12:22:30 2014 +0900 taskschd: Don't accept task XML with an invalid boolean value. --- dlls/taskschd/task.c | 44 +++++++++++++++++++-------------------- dlls/taskschd/tests/scheduler.c | 1 - 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1288314..7dd9f04 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1553,8 +1553,8 @@ static HRESULT read_variantbool_value(IXmlReader *reader, VARIANT_BOOL *vbool) *vbool = VARIANT_FALSE; else { - FIXME("unexpected bool value %s\n", debugstr_w(value)); - return E_FAIL; + WARN("unexpected bool value %s\n", debugstr_w(value)); + return SCHED_E_INVALIDVALUE; } return S_OK; @@ -1826,62 +1826,62 @@ static HRESULT read_settings(IXmlReader *reader, ITaskSettings *taskset) else if (!lstrcmpW(name, DisallowStartIfOnBatteries)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_DisallowStartIfOnBatteries(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_DisallowStartIfOnBatteries(taskset, bool_val); } else if (!lstrcmpW(name, AllowStartOnDemand)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_AllowDemandStart(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_AllowDemandStart(taskset, bool_val); } else if (!lstrcmpW(name, StopIfGoingOnBatteries)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_StopIfGoingOnBatteries(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_StopIfGoingOnBatteries(taskset, bool_val); } else if (!lstrcmpW(name, AllowHardTerminate)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_AllowHardTerminate(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_AllowHardTerminate(taskset, bool_val); } else if (!lstrcmpW(name, StartWhenAvailable)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_StartWhenAvailable(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_StartWhenAvailable(taskset, bool_val); } else if (!lstrcmpW(name, RunOnlyIfNetworkAvailable)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_RunOnlyIfNetworkAvailable(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_RunOnlyIfNetworkAvailable(taskset, bool_val); } else if (!lstrcmpW(name, Enabled)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_Enabled(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_Enabled(taskset, bool_val); } else if (!lstrcmpW(name, Hidden)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_Hidden(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_Hidden(taskset, bool_val); } else if (!lstrcmpW(name, RunOnlyIfIdle)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_RunOnlyIfIdle(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_RunOnlyIfIdle(taskset, bool_val); } else if (!lstrcmpW(name, WakeToRun)) { hr = read_variantbool_value(reader, &bool_val); - if (hr == S_OK) - ITaskSettings_put_WakeToRun(taskset, bool_val); + if (hr != S_OK) return hr; + ITaskSettings_put_WakeToRun(taskset, bool_val); } else if (!lstrcmpW(name, ExecutionTimeLimit)) { diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 48d16dd..4aad408 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1246,7 +1246,6 @@ todo_wine MultiByteToWideChar(CP_ACP, 0, xml7, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine ok(hr == SCHED_E_INVALIDVALUE, "expected SCHED_E_INVALIDVALUE, got %#x\n", hr); ITaskDefinition_Release(taskdef);

1 0

Nikolay Sivov : oleaut32: Propagate return codes properly.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

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 : scrrun: Added IDrive stub and Next() for drive collection.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

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

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

Feb. 25, 2014

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 Feb. 25, 2014

Feb. 25, 2014

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

Piotr Caban : qcap: Add Avi Mux Receive helper implementation.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: 0c73ce54cd1e8318541c225e38c66e1a4b526ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c73ce54cd1e8318541c225e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 25 12:23:31 2014 +0100 qcap: Add Avi Mux Receive helper implementation. --- dlls/qcap/avimux.c | 375 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 373 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c73ce54cd1e8318541c2…

1 0