March 2019 - Wine-devel - list.winehq.org

[PATCH v4 5/5] mfplat: Implement IMFattributes::GetCount().
by Jactry Zeng 08 Mar '19

08 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 10 +++++++--- dlls/mfplat/tests/mfplat.c | 27 +++++++++++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1749bd6929..3918d25f83 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -981,12 +981,16 @@ static HRESULT WINAPI mfattributes_GetCount(IMFAttributes *iface, UINT32 *items) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %p\n", This, items); + TRACE("(%p, %p)\n", This, items); + + EnterCriticalSection(&This->lock); if(items) - *items = 0; + *items = This->count; - return E_NOTIMPL; + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 index, GUID *key, PROPVARIANT *value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 55c9f516c3..732e098a3a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -416,11 +416,20 @@ static void test_MFCreateMediaEvent(void) IMFMediaEvent_Release(mediaevent); } +#define CHECK_COUNT(obj,expected) _check_count(obj, expected, __LINE__) +static void _check_count(IMFAttributes* obj, ULONG expected, int line) +{ + UINT32 count = 9999; + HRESULT hr; + hr = IMFAttributes_GetCount(obj, &count); + ok_(__FILE__,line)(hr == S_OK, "IMFAttributes_GetCount failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(count == expected, "got %d, expected %d.\n", count, expected); +} + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; HRESULT hr; - UINT32 count; PROPVARIANT propvar, ret_propvar; GUID key; UINT32 uint32_value; @@ -428,18 +437,11 @@ static void test_MFCreateAttributes(void) hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); - - count = 88; - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 0, "got %d\n", count); + CHECK_COUNT(attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(count == 1, "got %d\n", count); + CHECK_COUNT(attributes, 1); uint32_value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); @@ -453,6 +455,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 1); hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); @@ -525,9 +528,11 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID3, &propvar); ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 3); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); key = GUID_NULL; + CHECK_COUNT(attributes, 2); if (is_win8_plus) hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); else @@ -551,8 +556,10 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_GetItemByIndex(attributes, 999, &key, &ret_propvar); ok(hr == E_INVALIDARG, "IMFAttributes_GetItemByIndex returned: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); IMFAttributes_Release(attributes); } -- 2.20.1

1 0

[PATCH v4 3/5] mfplat: Implement IMFAttributes::GetItemByIndex().
by Jactry Zeng 08 Mar '19

08 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 17 +++++++++++++++-- dlls/mfplat/tests/mfplat.c | 15 +++++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 05e56ccb72..5ae3b4ff07 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -949,9 +949,22 @@ static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 i { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %d, %p, %p\n", This, index, key, value); + TRACE("(%p, %d, %p, %p)\n", This, index, key, value); - return E_NOTIMPL; + EnterCriticalSection(&This->lock); + + if (index >= This->count) + { + LeaveCriticalSection(&This->lock); + return E_INVALIDARG; + } + + *key = This->attributes[This->count - index - 1].key; + PropVariantCopy(value, &This->attributes[This->count - index - 1].value); + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_CopyAllItems(IMFAttributes *iface, IMFAttributes *dest) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c355e792a7..ea70b4bf5f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -508,9 +508,9 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); else hr = IMFAttributes_GetItemByIndex(attributes, 1, &key, &ret_propvar); - todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); - todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); - todo_wine ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); PropVariantClear(&ret_propvar); PropVariantClear(&propvar); propvar.vt = MF_ATTRIBUTE_UINT64; @@ -520,9 +520,12 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_GetItemByIndex(attributes, 1, &key, &ret_propvar); else hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); - todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); - todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); - todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + + hr = IMFAttributes_GetItemByIndex(attributes, 999, &key, &ret_propvar); + ok(hr == E_INVALIDARG, "IMFAttributes_GetItemByIndex returned: 0x%08x.\n", hr); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); -- 2.20.1

1 0

[PATCH v4 2/5] mfplat: Implement IMFAttributes::DeleteItem().
by Jactry Zeng 08 Mar '19

08 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 23 +++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 5 ++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 22803dc1b4..05e56ccb72 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -818,10 +818,29 @@ static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, RE static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) { mfattributes *This = impl_from_IMFAttributes(iface); + struct mfattribute *attribute = NULL; + size_t index = 0; - FIXME("%p, %s\n", This, debugstr_guid(key)); + TRACE("(%p, %s)\n", This, debugstr_guid(key)); - return E_NOTIMPL; + EnterCriticalSection(&This->lock); + + attribute = mfattributes_find_item(This, key, &index); + if (attribute) + { + size_t count; + + PropVariantClear(&attribute->value); + + This->count--; + count = This->count - index; + if (count) + memmove(&This->attributes[index], &This->attributes[index + 1], count * sizeof(*This->attributes)); + } + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 95f13725bf..c355e792a7 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -502,7 +502,7 @@ static void test_MFCreateAttributes(void) ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); - todo_wine ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); key = GUID_NULL; if (is_win8_plus) hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); @@ -524,6 +524,9 @@ static void test_MFCreateAttributes(void) todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); + ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + IMFAttributes_Release(attributes); } -- 2.20.1

1 0

[PATCH 10/10] d3dx9: Merge the d3dx_effect_SetIntArray() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e5f87a32c0..d25fa29915 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,44 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const INT *n, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < size; ++i) - { - set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); - } - set_dirty(param); - return D3D_OK; - - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3391,10 +3353,39 @@ static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE paramete static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); - return d3dx9_base_effect_set_int_array(&effect->base_effect, parameter, n, count); + if (param) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); + set_dirty(param); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) -- 2.20.1

1 0

[PATCH 09/10] d3dx9: Merge the d3dx_effect_SetInt() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 80 +++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 44 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1f7f22079b..e5f87a32c0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,49 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - if (param->rows == 1 && param->columns == 1) - { - DWORD value; - - set_number(&value, param->type, &n, D3DXPT_INT); - if (value != *(DWORD *)param->data) - set_dirty(param); - *(DWORD *)param->data = value; - return D3D_OK; - } - - /* - * Split the value, if parameter is a vector with dimension 3 or 4. - */ - if (param->type == D3DXPT_FLOAT && - ((param->class == D3DXPC_VECTOR && param->columns != 2) || - (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) - { - TRACE("Vector fixup\n"); - - *(FLOAT *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; - ((FLOAT *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; - ((FLOAT *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; - if (param->rows * param->columns > 3) - { - ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; - } - set_dirty(param); - return D3D_OK; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const INT *n, UINT count) { @@ -3351,10 +3308,45 @@ static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n); - return d3dx9_base_effect_set_int(&effect->base_effect, parameter, n); + if (param && !param->element_count) + { + if (param->rows == 1 && param->columns == 1) + { + DWORD value; + + set_number(&value, param->type, &n, D3DXPT_INT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; + return D3D_OK; + } + + /* + * Split the value, if parameter is a vector with dimension 3 or 4. + */ + if (param->type == D3DXPT_FLOAT && + ((param->class == D3DXPC_VECTOR && param->columns != 2) || + (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) + { + TRACE("Vector fixup.\n"); + + *(FLOAT *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + ((FLOAT *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + ((FLOAT *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; + if (param->rows * param->columns > 3) + ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + set_dirty(param); + return D3D_OK; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) -- 2.20.1

1 0

[PATCH 08/10] d3dx9: Merge the d3dx_effect_GetIntArray() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b08344ca4b..1f7f22079b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1426,30 +1426,6 @@ static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, INT *n, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (n && param && (param->class == D3DXPC_SCALAR - || param->class == D3DXPC_VECTOR - || param->class == D3DXPC_MATRIX_ROWS - || param->class == D3DXPC_MATRIX_COLUMNS)) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - for (i = 0; i < size; ++i) - { - set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); - } - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3432,10 +3408,25 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); - return d3dx9_base_effect_get_int_array(&effect->base_effect, parameter, n, count); + if (n && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) -- 2.20.1

1 0

[PATCH] uianimation.idl: Add more interfaces
by Vijay Kiran Kamuju 07 Mar '19

07 Mar '19

with minor changes related to coclass definiions From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/uianimation.idl | 267 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 267 insertions(+) diff --git a/include/uianimation.idl b/include/uianimation.idl index 6c026a6ced..e8b366e8fb 100644 --- a/include/uianimation.idl +++ b/include/uianimation.idl @@ -20,10 +20,19 @@ import "unknwn.idl"; interface IUIAnimationStoryboard; interface IUIAnimationVariable; +interface IUIAnimationManager; +interface IUIAnimationPriorityComparison; +interface IUIAnimationTransitionFactory; +interface IUIAnimationInterpolator; +interface IUIAnimationManagerEventHandler; +interface IUIAnimationTransition; +interface IUIAnimationTransitionLibrary; typedef DOUBLE UI_ANIMATION_SECONDS; typedef struct { int _; } *UI_ANIMATION_KEYFRAME; +const UI_ANIMATION_SECONDS UI_ANIMATION_SECONDS_EVENTUALLY = -1.0; + typedef enum { UI_ANIMATION_MANAGER_IDLE, @@ -76,6 +85,34 @@ typedef enum UI_ANIMATION_IDLE_BEHAVIOR_DISABLE, } UI_ANIMATION_IDLE_BEHAVIOR; +typedef [v1_enum] enum +{ + UI_ANIMATION_MODE_DISABLED, + UI_ANIMATION_MODE_SYSTEM_DEFAULT, + UI_ANIMATION_MODE_ENABLED +} UI_ANIMATION_MODE; + +typedef [v1_enum] enum +{ + UI_ANIMATION_PRIORITY_EFFECT_FAILURE, + UI_ANIMATION_PRIORITY_EFFECT_DELAY +} UI_ANIMATION_PRIORITY_EFFECT; + +typedef [v1_enum] enum +{ + UI_ANIMATION_DEPENDENCY_NONE = 0, + UI_ANIMATION_DEPENDENCY_INTERMEDIATE_VALUES = 0x1, + UI_ANIMATION_DEPENDENCY_FINAL_VALUE = 0x2, + UI_ANIMATION_DEPENDENCY_FINAL_VELOCITY = 0x4, + UI_ANIMATION_DEPENDENCY_DURATION = 0x8 +} UI_ANIMATION_DEPENDENCIES; + +typedef [v1_enum] enum +{ + UI_ANIMATION_SLOPE_INCREASING, + UI_ANIMATION_SLOPE_DECREASING +} UI_ANIMATION_SLOPE; + [ local, object, @@ -334,6 +371,212 @@ interface IUIAnimationTimer : IUnknown [in] UINT32 fps); } +[ + local, + object, + uuid(9169896c-ac8d-4e7d-94e5-67fa4dc2f2e8), + pointer_default(unique) +] +interface IUIAnimationManager : IUnknown +{ + HRESULT CreateAnimationVariable( + [in] UI_ANIMATION_SECONDS initialvalue, + [out, retval] IUIAnimationVariable **variable); + + HRESULT ScheduleTransition( + [in] IUIAnimationVariable *variable, + [in] IUIAnimationTransition *transition, + [in] UI_ANIMATION_SECONDS timenow); + + HRESULT CreateStoryboard( + [out, retval] IUIAnimationStoryboard **storyboard); + + HRESULT FinishAllStoryboards( + [in] UI_ANIMATION_SECONDS deadline); + + HRESULT AbandonAllStoryboards(); + + HRESULT Update( + [in] UI_ANIMATION_SECONDS timenow, + [out, defaultvalue(0)] UI_ANIMATION_UPDATE_RESULT *updateresult); + + HRESULT GetVariableFromTag( + [in] IUnknown * object, + [in] UINT32 id, + [out, retval] IUIAnimationVariable **variable); + + HRESULT GetStoryboardFromTag( + [in] IUnknown * object, + [in] UINT32 id, + [out, retval] IUIAnimationStoryboard **storyboard); + + HRESULT GetStatus( + [out, retval] UI_ANIMATION_MANAGER_STATUS *status); + + HRESULT SetAnimationMode( + [in] UI_ANIMATION_MODE mode); + + HRESULT Pause(); + + HRESULT Resume(); + + HRESULT SetManagerEventHandler( + [in] IUIAnimationManagerEventHandler *handler); + + HRESULT SetCancelPriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetTrimPriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetCompressPriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetConcludePriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetDefaultLongestAcceptableDelay( + [in] UI_ANIMATION_SECONDS delay); + + HRESULT Shutdown(); +} + +[ + local, + object, + uuid(83fa9b74-5f86-4618-bc6a-a2fac19b3f44), + pointer_default(unique) +] +interface IUIAnimationPriorityComparison : IUnknown +{ + HRESULT HasPriority( + [in] IUIAnimationStoryboard *scheduledboard, + [in] IUIAnimationStoryboard *newboard, + [in] UI_ANIMATION_PRIORITY_EFFECT effect); +} + +[ + local, + object, + uuid(fcd91e03-3e3b-45ad-bbb1-6dfc8153743d), + pointer_default(unique) +] +interface IUIAnimationTransitionFactory : IUnknown +{ + HRESULT CreateTransition( + [in] IUIAnimationInterpolator *interpolator, + [out, retval] IUIAnimationTransition **transition); +} + +[ + local, + object, + uuid(7815cbba-ddf7-478c-a46c-7b6c738b7978), + pointer_default(unique) +] +interface IUIAnimationInterpolator : IUnknown +{ + HRESULT SetInitialValueAndVelocity( + [in] double initialvalue, + [in] double initialvelocity); + + HRESULT SetDuration( + [in] UI_ANIMATION_SECONDS duration); + + HRESULT GetDuration( + [out, retval] UI_ANIMATION_SECONDS *duration); + + HRESULT GetFinalValue( + [out, retval] double *value); + + HRESULT InterpolateValue( + [in] UI_ANIMATION_SECONDS offset, + [out, retval] double *value); + + HRESULT InterpolateVelocity( + [in] UI_ANIMATION_SECONDS offset, + [out, retval] double *velocity); + + HRESULT GetDependencies( + [out] UI_ANIMATION_DEPENDENCIES *initialvaluedependencies, + [out] UI_ANIMATION_DEPENDENCIES *initialvelocitydependencies, + [out] UI_ANIMATION_DEPENDENCIES *durationdependencies); +} + +[ + local, + object, + uuid(ca5a14b1-d24f-48b8-8fe4-c78169ba954e), + pointer_default(unique) +] +interface IUIAnimationTransitionLibrary : IUnknown +{ + HRESULT CreateInstantaneousTransition( + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateConstantTransition( + [in] UI_ANIMATION_SECONDS duration, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateDiscreteTransition( + [in] UI_ANIMATION_SECONDS delay, + [in] double finalvalue, + [in] UI_ANIMATION_SECONDS hold, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateLinearTransition( + [in] UI_ANIMATION_SECONDS duration, + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateLinearTransitionFromSpeed( + [in] double speed, + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateSinusoidalTransitionFromVelocity( + [in] UI_ANIMATION_SECONDS duration, + [in] UI_ANIMATION_SECONDS period, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateSinusoidalTransitionFromRange( + [in] UI_ANIMATION_SECONDS duration, + [in] double minimumvalue, + [in] double maximumvalue, + [in] UI_ANIMATION_SECONDS period, + [in] UI_ANIMATION_SLOPE slope, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateAccelerateDecelerateTransition( + [in] UI_ANIMATION_SECONDS duration, + [in] double finalvalue, + [in] double accelerationratio, + [in] double decelerationratio, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateReversalTransition( + [in] UI_ANIMATION_SECONDS duration, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateCubicTransition( + [in] UI_ANIMATION_SECONDS duration, + [in] double finalvalue, + [in] double finalvelocity, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateSmoothStopTransition( + [in] UI_ANIMATION_SECONDS maximumduration, + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateParabolicTransitionFromAcceleration( + [in] UI_ANIMATION_SECONDS finalvalue, + [in] double finalvelocity, + [in] double acceleration, + [out, retval] IUIAnimationTransition **transition); +} + [ uuid(44ca24db-1a92-4149-bab5-fb14d64b401e), version(1.0) @@ -347,4 +590,28 @@ library UIAnimation { [default] interface IUIAnimationTimer; } + + [ + uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8) + ] + coclass UIAnimationManager + { + [default] interface IUIAnimationManager; + } + + [ + uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887) + ] + coclass UIAnimationTransitionFactory + { + [default] interface IUIAnimationTransitionFactory; + } + + [ + uuid(1d6322ad-aa85-4ef5-a828-86d71067d145) + ] + coclass UIAnimationTransitionLibrary + { + [default] interface IUIAnimationTransitionLibrary; + } } -- 2.21.0

1 0

[PATCH] cmd: Allow starting native executables
by Fabian Maurer 07 Mar '19

07 Mar '19

Note that this is obviously different from what windows cmd does, but Wine has a different situation. Running native binaries without 'start' is pretty useful, IMHO. We check for a magic signature to avoid regressions in case there is a file without the extension that's not a native executable. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/cmd/wcmdmain.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 637c0e94bd..26910ee4c8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1009,6 +1009,29 @@ static void init_msvcrt_io_block(STARTUPINFOW* st) } } +static BOOL is_native_executable(WCHAR *path) +{ + HANDLE file; + char buffer[4]; + static const char magic_elf[] = {0x7f, 'E', 'L', 'F'}; + DWORD bytes_read; + + file = CreateFileW(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + ReadFile(file, buffer, ARRAY_SIZE(buffer), &bytes_read, NULL); + CloseHandle(file); + + if (bytes_read < ARRAY_SIZE(buffer)) + return FALSE; + + if (memcmp(buffer, magic_elf, 4) == 0) + return TRUE; + + if (memcmp(buffer, "#!/", 3) == 0) + return TRUE; + + return FALSE; +} + /****************************************************************************** * WCMD_run_program * @@ -1141,11 +1164,11 @@ void WCMD_run_program (WCHAR *command, BOOL called) strcatW(thisDir, stemofsearch); pos = &thisDir[strlenW(thisDir)]; /* Pos = end of name */ - /* 1. If extension supplied, see if that file exists */ - if (extensionsupplied) { - if (GetFileAttributesW(thisDir) != INVALID_FILE_ATTRIBUTES) { - found = TRUE; - } + /* 1. If extension supplied, see if that file exists - also check if we got a path to a native executable */ + if (GetFileAttributesW(thisDir) != INVALID_FILE_ATTRIBUTES) { + if (extensionsupplied || is_native_executable(thisDir)) { + found = TRUE; + } } /* 2. Any .* matches? */ -- 2.21.0

2 5

[PATCH 7/7] d3dx9: Merge the d3dx_effect_GetBoolArray() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 43 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4ff695c6dd..4deb40f55e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1400,30 +1400,6 @@ static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_bool_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, BOOL *b, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (b && param && (param->class == D3DXPC_SCALAR - || param->class == D3DXPC_VECTOR - || param->class == D3DXPC_MATRIX_ROWS - || param->class == D3DXPC_MATRIX_COLUMNS)) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - for (i = 0; i < size; ++i) - { - set_number(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type); - } - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n) { struct d3dx_parameter *param = get_valid_parameter(base, parameter); @@ -3522,10 +3498,27 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); - return d3dx9_base_effect_get_bool_array(&effect->base_effect, parameter, b, count); + if (b && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + { + set_number(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type); + } + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) -- 2.20.1

3 2

[PATCH 6/7] d3dx9: Merge the d3dx_effect_GetBool() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8147dc14a1..4ff695c6dd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1361,22 +1361,6 @@ static HRESULT d3dx9_base_effect_set_bool(struct d3dx9_base_effect *base, D3DXHA return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_bool(struct d3dx9_base_effect *base, D3DXHANDLE parameter, BOOL *b) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (b && param && !param->element_count && param->rows == 1 && param->columns == 1) - { - set_number(b, D3DXPT_BOOL, param->data, param->type); - TRACE("Returning %s\n", *b ? "TRUE" : "FALSE"); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const BOOL *b, UINT count) { @@ -3510,10 +3494,20 @@ static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE paramet static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, b %p.\n", iface, parameter, b); - return d3dx9_base_effect_get_bool(&effect->base_effect, parameter, b); + if (b && param && !param->element_count && param->rows == 1 && param->columns == 1) + { + set_number(b, D3DXPT_BOOL, param->data, param->type); + TRACE("Returning %s\n", *b ? "TRUE" : "FALSE"); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count) -- 2.20.1

3 2