February 2014 - Wine-Commits

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

Feb. 25, 2014

Module: wine Branch: master Commit: f4d7a9ab53cfe101fe3f7d712473a4e393df3204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d7a9ab53cfe101fe3f7d712… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 25 12:23:44 2014 +0100 qcap: Add Avi Mux IMemInputPin::Receive implementation. --- dlls/qcap/avimux.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index a186b16..8ec15ba 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1996,8 +1996,10 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_Receive( { AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)->(%p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pSample); - return E_NOTIMPL; + + TRACE("(%p:%s)->(%p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pSample); + + return avimuxin->pin.pFuncsTable->pfnReceive(&avimuxin->pin, pSample); } static HRESULT WINAPI AviMuxIn_MemInputPin_ReceiveMultiple(IMemInputPin *iface, @@ -2005,9 +2007,19 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_ReceiveMultiple(IMemInputPin *iface, { AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)->(%p %d %p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), + HRESULT hr = S_OK; + + TRACE("(%p:%s)->(%p %d %p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pSamples, nSamples, nSamplesProcessed); - return E_NOTIMPL; + + for(*nSamplesProcessed=0; *nSamplesProcessed<nSamples; (*nSamplesProcessed)++) + { + hr = avimuxin->pin.pFuncsTable->pfnReceive(&avimuxin->pin, pSamples[*nSamplesProcessed]); + if(hr != S_OK) + break; + } + + return hr; } static HRESULT WINAPI AviMuxIn_MemInputPin_ReceiveCanBlock(IMemInputPin *iface)

1 0

Francois Gouget : winmm/tests: Change the current directory to a place that will be writable.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: d155df5c19bc5b4f8254b7d6f7e46e3f38ec472f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d155df5c19bc5b4f8254b7d6f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 23:56:50 2014 +0100 winmm/tests: Change the current directory to a place that will be writable. --- dlls/winmm/tests/mci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 6a68b41..c162fce 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1297,8 +1297,14 @@ static void test_AutoOpenWAVE(HWND hwnd) START_TEST(mci) { + char curdir[MAX_PATH], tmpdir[MAX_PATH]; MCIERROR err; HWND hwnd; + + GetCurrentDirectoryA(MAX_PATH, curdir); + GetTempPathA(MAX_PATH, tmpdir); + SetCurrentDirectoryA(tmpdir); + hwnd = CreateWindowExA(0, "static", "winmm test", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); test_mciParser(hwnd); @@ -1315,4 +1321,6 @@ START_TEST(mci) ok(!err,"final close all returned %s\n", dbg_mcierr(err)); ok(DeleteFileA("tempfile.wav") || ok_saved, "Delete tempfile.wav (cause auto-open?)\n"); DestroyWindow(hwnd); + + SetCurrentDirectoryA(curdir); }

1 0

Francois Gouget : d3d9/tests: Fix some test failures on Windows 2000.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: e08c6947c2cd8fe0effc3b341b07c94ba26287d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e08c6947c2cd8fe0effc3b341… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 23:54:22 2014 +0100 d3d9/tests: Fix some test failures on Windows 2000. --- dlls/d3d9/tests/device.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 07b1c39..3238766 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -206,7 +206,7 @@ static void test_mipmap_levels(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "Failed to create IDirect3D9Device (%08x)\n", hr); + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "Failed to create IDirect3D9Device (%08x)\n", hr); if (FAILED(hr)) { skip("failed to create a d3d device\n"); goto cleanup; @@ -254,7 +254,7 @@ static void test_checkdevicemultisampletype(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "Failed to create IDirect3D9Device (%08x)\n", hr); + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "Failed to create IDirect3D9Device (%08x)\n", hr); if (FAILED(hr)) { skip("failed to create a d3d device\n"); goto cleanup; @@ -318,7 +318,7 @@ static void test_swapchain(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "Failed to create IDirect3D9Device (%08x)\n", hr); if (FAILED(hr)) goto cleanup; @@ -491,7 +491,7 @@ static void test_refcount(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "Failed to create IDirect3D9Device (%08x)\n", hr); if (FAILED(hr)) goto cleanup; @@ -812,7 +812,7 @@ static void test_cursor(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "Failed to create IDirect3D9Device (%08x)\n", hr); if (FAILED(hr)) goto cleanup; @@ -1481,7 +1481,7 @@ static void test_scene(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "IDirect3D9_CreateDevice failed with %08x\n", hr); if(!pDevice) { skip("Failed to create a d3d device\n"); @@ -1639,7 +1639,7 @@ static void test_limits(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "IDirect3D9_CreateDevice failed with %08x\n", hr); if(!pDevice) { skip("Failed to create a d3d device\n"); @@ -1712,7 +1712,7 @@ static void test_depthstenciltest(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "IDirect3D9_CreateDevice failed with %08x\n", hr); if(!pDevice) { skip("Failed to create a d3d device\n"); @@ -2060,7 +2060,7 @@ static void test_null_stream(void) hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), "IDirect3D9_CreateDevice failed with %08x\n", hr); if(!device) { skip("Failed to create a d3d device\n");

1 0

Matteo Bruni : d3dx9: Remove Begin/End stub fixmes.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: 244100f01cc180407b691bcb6662ec0deb2fb299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=244100f01cc180407b691bcb6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:48 2014 +0100 d3dx9: Remove Begin/End stub fixmes. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 61d6829..a4325af 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3145,7 +3145,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = This->active_technique; - FIXME("iface %p, passes %p, flags %#x partial stub\n", iface, passes, flags); + TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); if (passes && technique) { @@ -3230,7 +3230,7 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("iface %p partial stub\n", iface); + TRACE("iface %p.\n", iface); if (!This->started) return D3D_OK;

1 0

Nikolay Sivov : scrrun: Implement DriveType property of IDrive.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

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

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

Feb. 25, 2014

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

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

Feb. 25, 2014

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

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

Feb. 25, 2014

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

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

Feb. 25, 2014

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

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

Feb. 25, 2014

Module: wine Branch: master Commit: ce1175149bc92fc8664af507833f1731de0789a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce1175149bc92fc8664af5078… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 25 00:05:34 2014 +0100 comdlg32/tests: Use BOOL type where appropriate. --- dlls/comdlg32/tests/filedlg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index d96d976..e3d9bc7 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -325,7 +325,7 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L { static RECT initrc, rc; static int index, count; - static int gotSWP_bottom, gotShowWindow; + static BOOL gotSWP_bottom, gotShowWindow; HWND parent = GetParent( dlg); int resize; #define MAXNRCTRLS 30 @@ -342,7 +342,7 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L index = ((OPENFILENAMEA*)lParam)->lCustData; count = 0; - gotSWP_bottom = gotShowWindow = 0; + gotSWP_bottom = gotShowWindow = FALSE; /* test style */ style = GetWindowLongA( parent, GWL_STYLE); if( resize_testcases[index].flags & OFN_ENABLESIZING) @@ -515,16 +515,16 @@ todo_wine { WINDOWPOS *pwp = (WINDOWPOS *)lParam; if( !index && pwp->hwndInsertAfter == HWND_BOTTOM){ - gotSWP_bottom = 1; - ok( gotShowWindow == 0, "The WM_WINDOWPOSCHANGING message came after a WM_SHOWWINDOW message\n"); + gotSWP_bottom = TRUE; + ok(!gotShowWindow, "The WM_WINDOWPOSCHANGING message came after a WM_SHOWWINDOW message\n"); } } break; case WM_SHOWWINDOW: { if( !index){ - gotShowWindow = 1; - ok( gotSWP_bottom == 1, "No WM_WINDOWPOSCHANGING message came before a WM_SHOWWINDOW message\n"); + gotShowWindow = TRUE; + ok(gotSWP_bottom, "No WM_WINDOWPOSCHANGING message came before a WM_SHOWWINDOW message\n"); } } break;

1 0