wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Matteo Bruni : d3dx9: Don't call CoUninitialize if CoInitializeEx failed.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 8226a187d63e3d355127cf1db830a4281132a598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8226a187d63e3d355127cf1db… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:49 2014 +0100 d3dx9: Don't call CoUninitialize if CoInitializeEx failed. --- dlls/d3dx9_36/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 94301e8..5e87d94 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1025,7 +1025,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, const RECT *pSrcRect, DWORD dwFilter, D3DCOLOR Colorkey, D3DXIMAGE_INFO *pSrcInfo) { D3DXIMAGE_INFO imginfo; - HRESULT hr; + HRESULT hr, com_init; IWICImagingFactory *factory = NULL; IWICBitmapDecoder *decoder; @@ -1078,7 +1078,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, if (imginfo.ImageFileFormat == D3DXIFF_DIB) convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize); - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + com_init = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) goto cleanup_err; @@ -1181,7 +1181,8 @@ cleanup_err: if (factory) IWICImagingFactory_Release(factory); - CoUninitialize(); + if (SUCCEEDED(com_init)) + CoUninitialize(); if (imginfo.ImageFileFormat == D3DXIFF_DIB) HeapFree(GetProcessHeap(), 0, (void*)pSrcData);

1 0

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

25 Feb '14

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

Matteo Bruni : d3dx9: Kill a noisy TRACE.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 49604ca1b7bde7c6b2af778299d147f9bce08622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49604ca1b7bde7c6b2af77829… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:47 2014 +0100 d3dx9: Kill a noisy TRACE. --- dlls/d3dx9_36/util.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index bba8514..3b3f308 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -349,8 +349,6 @@ static FLOAT get_float(D3DXPARAMETER_TYPE type, const void *data) void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) { - TRACE("Changing from type %s to type %s\n", debug_d3dxparameter_type(intype), debug_d3dxparameter_type(outtype)); - if (outtype == intype) { *(DWORD *)outdata = *(DWORD *)indata;

1 0

Matteo Bruni : d3dx9: Call D3DCompile() for ASCII effects.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 62288d02bed7fdd30f50e73b0eda20a4c465fe25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62288d02bed7fdd30f50e73b0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:46 2014 +0100 d3dx9: Call D3DCompile() for ASCII effects. --- dlls/d3dx9_36/effect.c | 76 ++++++++++++++++++++++++++++++------------ dlls/d3dx9_36/tests/effect.c | 14 ++++++-- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 548d5ee..61d6829 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -26,6 +26,7 @@ #include "windef.h" #include "wingdi.h" #include "d3dx9_36_private.h" +#include "d3dcompiler.h" /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f @@ -5188,11 +5189,13 @@ err_out: } static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, - const char *data, SIZE_T data_size, struct ID3DXEffectImpl *effect) + const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, + UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect) { DWORD tag, offset; const char *ptr = data; HRESULT hr; + ID3DBlob *bytecode = NULL, *temp_errors = NULL; TRACE("base %p, data %p, data_size %lu, effect %p\n", base, data, data_size, effect); @@ -5203,30 +5206,55 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, if (tag != d3dx9_effect_version(9, 1)) { - /* todo: compile hlsl ascii code */ - FIXME("HLSL ascii effects not supported, yet\n"); - - /* Show the start of the shader for debugging info. */ - TRACE("effect:\n%s\n", debugstr_an(data, data_size > 40 ? 40 : data_size)); - } - else - { - read_dword(&ptr, &offset); - TRACE("Offset: %x\n", offset); - - hr = d3dx9_parse_effect(base, ptr, data_size, offset); - if (hr != D3D_OK) + TRACE("HLSL ASCII effect, trying to compile it.\n"); + hr = D3DCompile(data, data_size, NULL, defines, include, + "main", "fx_2_0", 0, eflags, &bytecode, &temp_errors); + if (FAILED(hr)) { - FIXME("Failed to parse effect.\n"); + WARN("Failed to compile ASCII effect.\n"); + if (bytecode) + ID3D10Blob_Release(bytecode); + if (temp_errors) + TRACE("%s\n", (char *)ID3D10Blob_GetBufferPointer(temp_errors)); + if (errors) + *errors = temp_errors; + else if (temp_errors) + ID3D10Blob_Release(temp_errors); return hr; } + if (!bytecode) + { + FIXME("No output from effect compilation.\n"); + return D3DERR_INVALIDCALL; + } + if (errors) + *errors = temp_errors; + else if (temp_errors) + ID3D10Blob_Release(temp_errors); + + ptr = ID3D10Blob_GetBufferPointer(bytecode); + read_dword(&ptr, &tag); + TRACE("Tag: %x\n", tag); + } + + read_dword(&ptr, &offset); + TRACE("Offset: %x\n", offset); + + hr = d3dx9_parse_effect(base, ptr, data_size, offset); + if (bytecode) + ID3D10Blob_Release(bytecode); + if (hr != D3D_OK) + { + FIXME("Failed to parse effect.\n"); + return hr; } return D3D_OK; } static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3DDevice9 *device, - const char *data, SIZE_T data_size, struct ID3DXEffectPool *pool) + const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, + UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool) { HRESULT hr; @@ -5241,7 +5269,8 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3 IDirect3DDevice9_AddRef(device); effect->device = device; - if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, effect))) + if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, defines, include, + eflags, error_messages, effect))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect(effect); @@ -5285,7 +5314,8 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (!object) return E_OUTOFMEMORY; - hr = d3dx9_effect_init(object, device, srcdata, srcdatalen, pool); + hr = d3dx9_effect_init(object, device, srcdata, srcdatalen, (const D3D_SHADER_MACRO *)defines, + (ID3DInclude *)include, flags, (ID3DBlob **)compilation_errors, pool); if (FAILED(hr)) { WARN("Failed to initialize shader reflection\n"); @@ -5310,7 +5340,9 @@ HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *src return D3DXCreateEffectEx(device, srcdata, srcdatalen, defines, include, NULL, flags, pool, effect, compilation_errors); } -static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compiler, const char *data, SIZE_T data_size) +static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compiler, + const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, + UINT eflags, ID3DBlob **error_messages) { HRESULT hr; @@ -5319,7 +5351,8 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil compiler->ID3DXEffectCompiler_iface.lpVtbl = &ID3DXEffectCompiler_Vtbl; compiler->ref = 1; - if (FAILED(hr = d3dx9_base_effect_init(&compiler->base_effect, data, data_size, NULL))) + if (FAILED(hr = d3dx9_base_effect_init(&compiler->base_effect, data, data_size, defines, + include, eflags, error_messages, NULL))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect_compiler(compiler); @@ -5348,7 +5381,8 @@ HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, co if (!object) return E_OUTOFMEMORY; - hr = d3dx9_effect_compiler_init(object, srcdata, srcdatalen); + hr = d3dx9_effect_compiler_init(object, srcdata, srcdatalen, (const D3D_SHADER_MACRO *)defines, + (ID3DInclude *)include, flags, (ID3DBlob **)parse_errors); if (FAILED(hr)) { WARN("Failed to initialize effect compiler\n"); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index bc1ddbe..44f931c 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -156,7 +156,12 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, &effect, NULL); - ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + if (FAILED(hr)) + { + skip("Failed to compile effect, skipping test.\n"); + return; + } hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3DXBaseEffect, (void **)&base); ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x (E_NOINTERFACE)\n", hr, E_NOINTERFACE); @@ -265,7 +270,12 @@ static void test_create_effect_compiler(void) ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); hr = D3DXCreateEffectCompiler(effect_desc, 0, NULL, NULL, 0, &compiler, NULL); - ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + todo_wine ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + if (FAILED(hr)) + { + skip("D3DXCreateEffectCompiler failed, skipping test.\n"); + return; + } count = compiler->lpVtbl->Release(compiler); ok(count == 0, "Release failed %u\n", count);

1 0

Matteo Bruni : d3dx9: Calling CommitChanges with no active pass silently returns.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: b86b3dfa4022a515df6b578b8ca42a6a68ea74fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86b3dfa4022a515df6b578b8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:45 2014 +0100 d3dx9: Calling CommitChanges with no active pass silently returns. --- dlls/d3dx9_36/effect.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ac13c72..548d5ee 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3199,6 +3199,12 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) FIXME("(%p)->(): stub\n", This); + if (!This->active_pass) + { + WARN("Called without an active pass.\n"); + return D3D_OK; + } + return E_NOTIMPL; }

1 0

Christoph von Wittich : comctl32: Rename TBSTYLE_EX_UNDOC1 to TBSTYLE_EX_VERTICAL.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 37e0a1a5d4977a5f017709109dd6cf7a948b78e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e0a1a5d4977a5f017709109… Author: Christoph von Wittich <Christoph(a)ApiViewer.de> Date: Sat Feb 22 21:02:22 2014 +0100 comctl32: Rename TBSTYLE_EX_UNDOC1 to TBSTYLE_EX_VERTICAL. --- dlls/comctl32/toolbar.c | 8 ++++---- include/commctrl.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b523dc0..fb82961 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -219,7 +219,7 @@ typedef enum /* Used to find undocumented extended styles */ #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \ - TBSTYLE_EX_UNDOC1 | \ + TBSTYLE_EX_VERTICAL | \ TBSTYLE_EX_MIXEDBUTTONS | \ TBSTYLE_EX_DOUBLEBUFFER | \ TBSTYLE_EX_HIDECLIPPEDBUTTONS) @@ -1271,7 +1271,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize) * the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE * flag, and set the TBSTATE_WRAP flags manually on the appropriate items. * -* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_UNDOC1 can be used also to allow +* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_VERTICAL can be used also to allow * vertical toolbar lists. */ @@ -1287,7 +1287,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) /* no layout is necessary. Applications may use this style */ /* to perform their own layout on the toolbar. */ if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) && - !(infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1) ) return; + !(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) ) return; btnPtr = infoPtr->buttons; x = infoPtr->nIndent; @@ -3037,7 +3037,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) cy = TOP_BORDER + infoPtr->nRows * infoPtr->nButtonHeight + BOTTOM_BORDER; cx = parent_rect.right - parent_rect.left; - if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1)) + if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL)) { TOOLBAR_LayoutToolbar(infoPtr); InvalidateRect( infoPtr->hwndSelf, NULL, TRUE ); diff --git a/include/commctrl.h b/include/commctrl.h index 0f153e4..9993ec7 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1089,7 +1089,8 @@ static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', #define TBSTYLE_REGISTERDROP 0x4000 #define TBSTYLE_TRANSPARENT 0x8000 #define TBSTYLE_EX_DRAWDDARROWS 0x00000001 -#define TBSTYLE_EX_UNDOC1 0x00000004 /* similar to TBSTYLE_WRAPABLE */ +#define TBSTYLE_EX_MULTICOLUMN 0x00000002 +#define TBSTYLE_EX_VERTICAL 0x00000004 #define TBSTYLE_EX_MIXEDBUTTONS 0x00000008 #define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x00000010 /* don't show partially obscured buttons */ #define TBSTYLE_EX_DOUBLEBUFFER 0x00000080 /* Double Buffer the toolbar */

1 0

Huw Davies : wineps: Use the correct colours when a monochrome bitmap without a colour table is the source.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: ad7e889c1d58aec091e72f08db86346c74070128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7e889c1d58aec091e72f08d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 24 15:11:57 2014 +0000 wineps: Use the correct colours when a monochrome bitmap without a colour table is the source. --- dlls/wineps.drv/bitmap.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index f5a5547..c4d0a96 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -101,6 +101,7 @@ static BOOL PSDRV_WriteImageMaskHeader(PHYSDEV dev, const BITMAPINFO *info, INT INT widthSrc, INT heightSrc) { PSCOLOR bkgnd, foregnd; + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); assert(info->bmiHeader.biBitCount == 1); @@ -108,12 +109,20 @@ static BOOL PSDRV_WriteImageMaskHeader(PHYSDEV dev, const BITMAPINFO *info, INT the foregnd color corresponds to a bit equal to 0 in the bitmap. */ - PSDRV_CreateColor(dev, &foregnd, RGB(info->bmiColors[0].rgbRed, - info->bmiColors[0].rgbGreen, - info->bmiColors[0].rgbBlue) ); - PSDRV_CreateColor(dev, &bkgnd, RGB(info->bmiColors[1].rgbRed, - info->bmiColors[1].rgbGreen, - info->bmiColors[1].rgbBlue) ); + if (!info->bmiHeader.biClrUsed) + { + PSDRV_CreateColor( dev, &foregnd, GetTextColor( dev->hdc ) ); + bkgnd = physDev->bkColor; + } + else + { + PSDRV_CreateColor( dev, &foregnd, RGB(info->bmiColors[0].rgbRed, + info->bmiColors[0].rgbGreen, + info->bmiColors[0].rgbBlue) ); + PSDRV_CreateColor( dev, &bkgnd, RGB(info->bmiColors[1].rgbRed, + info->bmiColors[1].rgbGreen, + info->bmiColors[1].rgbBlue) ); + } PSDRV_WriteGSave(dev); PSDRV_WriteNewPath(dev);

1 0

Piotr Caban : qcap: Add Avi Mux input pin IMemInputPin:: ReceiveCanBlock implementation.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 90dfe084c6aabd791f8e7961bd5d2ddac27bed2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90dfe084c6aabd791f8e7961b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:11:26 2014 +0100 qcap: Add Avi Mux input pin IMemInputPin::ReceiveCanBlock implementation. --- dlls/qcap/avimux.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index e3ea363..626e144 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1441,8 +1441,15 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_ReceiveCanBlock(IMemInputPin *iface) { AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName)); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p:%s)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName)); + + if(!This->out->pin.pMemInputPin) + return S_FALSE; + + hr = IMemInputPin_ReceiveCanBlock(This->out->pin.pMemInputPin); + return hr != S_FALSE ? S_OK : S_FALSE; } static const IMemInputPinVtbl AviMuxIn_MemInputPinVtbl = {

1 0

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

24 Feb '14

Module: wine Branch: master Commit: 6017d55d07d65dba16e89e292a9bed207d8f4dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=6017d55d07d65dba16e89e292… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:11:12 2014 +0100 qcap: Add Avi Mux IConfigInterleaving::put_Mode implementation. --- dlls/qcap/avimux.c | 25 +++++++++++++++++++++++-- dlls/qcap/tests/qcap.c | 11 +++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index f9c2cc2..e3ea363 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -54,6 +54,7 @@ typedef struct { IPersistMediaPropertyBag IPersistMediaPropertyBag_iface; ISpecifyPropertyPages ISpecifyPropertyPages_iface; + InterleavingMode mode; AviMuxOut *out; int input_pin_no; AviMuxIn *in[MAX_PIN_NO-1]; @@ -331,8 +332,28 @@ static HRESULT WINAPI ConfigInterleaving_put_Mode( IConfigInterleaving *iface, InterleavingMode mode) { AviMux *This = impl_from_IConfigInterleaving(iface); - FIXME("(%p)->(%d)\n", This, mode); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%d)\n", This, mode); + + if(mode>INTERLEAVE_NONE_BUFFERED) + 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; + } + } + + This->mode = mode; + return S_OK; } static HRESULT WINAPI ConfigInterleaving_get_Mode( diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index dff5bb8..3734132 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1235,6 +1235,7 @@ static void test_AviMux(void) IMemInputPin *memin; ALLOCATOR_PROPERTIES props; IMemAllocator *memalloc; + IConfigInterleaving *ci; HRESULT hr; init_test_filter(&source_filter, PINDIR_OUTPUT, SOURCE_FILTER); @@ -1369,6 +1370,16 @@ static void test_AviMux(void) IMemAllocator_Release(memalloc); IMemInputPin_Release(memin); + hr = IBaseFilter_QueryInterface(avimux, &IID_IConfigInterleaving, (void**)&ci); + ok(hr == S_OK, "QueryInterface(IID_IConfigInterleaving) returned %x\n", hr); + hr = IConfigInterleaving_put_Mode(ci, 5); + ok(hr == E_INVALIDARG, "put_Mode returned %x\n", hr); + SET_EXPECT(Reconnect); + hr = IConfigInterleaving_put_Mode(ci, INTERLEAVE_FULL); + ok(hr == S_OK, "put_Mode returned %x\n", hr); + CHECK_CALLED(Reconnect); + IConfigInterleaving_Release(ci); + hr = IPin_Disconnect(avimux_out); ok(hr == S_OK, "Disconnect returned %x\n", hr);

1 0

Piotr Caban : qcap: Add Avi Mux input pin IMemInputPin::NotifyAllocator.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 43bef66e8bbd93ae6d86c81aa0f1c4adc8d8127e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bef66e8bbd93ae6d86c81aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:10:46 2014 +0100 qcap: Add Avi Mux input pin IMemInputPin::NotifyAllocator. --- dlls/qcap/avimux.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 555cc44..f9c2cc2 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1362,9 +1362,23 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_NotifyAllocator( { AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)->(%p %x)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), + ALLOCATOR_PROPERTIES props; + HRESULT hr; + + TRACE("(%p:%s)->(%p %x)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pAllocator, bReadOnly); - return E_NOTIMPL; + + if(!pAllocator) + return E_POINTER; + + memset(&props, 0, sizeof(props)); + hr = IMemAllocator_GetProperties(pAllocator, &props); + if(FAILED(hr)) + return hr; + + props.cbAlign = 1; + props.cbPrefix = 8; + return IMemAllocator_SetProperties(avimuxin->pin.pAllocator, &props, &props); } static HRESULT WINAPI AviMuxIn_MemInputPin_GetAllocatorRequirements(

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014