wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Jacek Caban : mshtml: Support argument type conversion for functions with dual interface return type.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 40c74cf33620e7a690c829a3eb32d18449c3aa10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c74cf33620e7a690c829a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 16:39:27 2019 +0200 mshtml: Support argument type conversion for functions with dual interface return type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 10 +++++++--- dlls/mshtml/tests/elements.js | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 30b3580..e637f13 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -302,12 +302,11 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, if(!info->arg_types) return; - for(i=0; i < info->argc; i++) info->arg_types[i] = desc->lprgelemdescParam[i].tdesc.vt; info->prop_vt = desc->elemdescFunc.tdesc.vt; - if(info->prop_vt != VT_VOID && !is_arg_type_supported(info->prop_vt)) { + if(info->prop_vt != VT_VOID && info->prop_vt != VT_PTR && !is_arg_type_supported(info->prop_vt)) { TRACE("%s: return type %d\n", debugstr_w(info->name), info->prop_vt); return; /* Fallback to ITypeInfo::Invoke */ } @@ -1197,8 +1196,13 @@ static HRESULT invoke_builtin_function(DispatchEx *This, func_info_t *func, DISP case vt: \ V_BYREF(&ret_ref) = &access(&retv); \ break - BUILTIN_TYPES_SWITCH; + BUILTIN_ARG_TYPES_SWITCH; #undef CASE_VT + case VT_PTR: + V_VT(&retv) = VT_DISPATCH; + V_VT(&ret_ref) = VT_BYREF | VT_DISPATCH; + V_BYREF(&ret_ref) = &V_DISPATCH(&retv); + break; default: assert(0); } diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 1423e3b..4c647d6 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -374,6 +374,8 @@ function test_style_properties() { elem.style.zIndex = 4; ok(computed_style.zIndex === 4, "computed_style.zIndex = " + computed_style.zIndex); + window.getComputedStyle(elem, null); + next_test(); }

1 0

Jacek Caban : mshtml: Support argument type conversion for functions with dual interface arguments.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 0a942e5d49908fe918e43d5ed0ae755c09e69a81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a942e5d49908fe918e43d5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 16:39:10 2019 +0200 mshtml: Support argument type conversion for functions with dual interface arguments. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 81a74b7..30b3580 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -49,6 +49,7 @@ static CRITICAL_SECTION cs_dispex_static_data = { &cs_dispex_static_data_dbg, -1 static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; typedef struct { + IID iid; VARIANT default_value; } func_arg_info_t; @@ -317,7 +318,31 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, } for(i=0; i < info->argc; i++) { - if(!is_arg_type_supported(info->arg_types[i])) { + TYPEDESC *tdesc = &desc->lprgelemdescParam[i].tdesc; + if(tdesc->vt == VT_PTR && tdesc->u.lptdesc->vt == VT_USERDEFINED) { + ITypeInfo *ref_type_info; + TYPEATTR *attr; + + hres = ITypeInfo_GetRefTypeInfo(dti, tdesc->u.lptdesc->u.hreftype, &ref_type_info); + if(FAILED(hres)) { + ERR("Coulg not get referenced type info: %08x\n", hres); + return; + } + + hres = ITypeInfo_GetTypeAttr(ref_type_info, &attr); + if(SUCCEEDED(hres)) { + assert(attr->typekind == TKIND_DISPATCH); + info->arg_info[i].iid = attr->guid; + ITypeInfo_ReleaseTypeAttr(ref_type_info, attr); + }else { + ERR("GetTypeAttr failed: %08x\n", hres); + } + ITypeInfo_Release(ref_type_info); + if(FAILED(hres)) + return; + info->arg_types[i] = VT_DISPATCH; + }else if(!is_arg_type_supported(info->arg_types[i])) { + TRACE("%s: unsupported arg type %s\n", debugstr_w(info->name), debugstr_vt(info->arg_types[i])); return; /* Fallback to ITypeInfo for unsupported arg types */ } @@ -1124,6 +1149,7 @@ static HRESULT invoke_builtin_function(DispatchEx *This, func_info_t *func, DISP return hres; for(i=0; i < func->argc; i++) { + BOOL own_value = FALSE; if(i >= dp->cArgs) { /* use default value */ arg_ptrs[i] = &func->arg_info[i].default_value; @@ -1137,6 +1163,24 @@ static HRESULT invoke_builtin_function(DispatchEx *This, func_info_t *func, DISP if(FAILED(hres)) break; arg_ptrs[i] = arg_buf + nconv++; + own_value = TRUE; + } + + if(func->arg_types[i] == VT_DISPATCH && !IsEqualGUID(&func->arg_info[i].iid, &IID_NULL) + && V_DISPATCH(arg_ptrs[i])) { + IDispatch *iface; + if(!own_value) { + arg_buf[nconv] = *arg_ptrs[i]; + arg_ptrs[i] = arg_buf + nconv++; + } + hres = IDispatch_QueryInterface(V_DISPATCH(arg_ptrs[i]), &func->arg_info[i].iid, (void**)&iface); + if(FAILED(hres)) { + WARN("Could not get %s iface: %08x\n", debugstr_guid(&func->arg_info[i].iid), hres); + break; + } + if(own_value) + IDispatch_Release(V_DISPATCH(arg_ptrs[i])); + V_DISPATCH(arg_ptrs[i]) = iface; } }

1 0

Jacek Caban : mshtml: Support argument type conversion for functions with IDispatch arguments.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 830c55bcf43c6642194f452b1b05b988008f413f URL: https://source.winehq.org/git/wine.git/?a=commit;h=830c55bcf43c6642194f452b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 16:38:46 2019 +0200 mshtml: Support argument type conversion for functions with IDispatch arguments. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e1c33b9..81a74b7 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -226,6 +226,7 @@ HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo) CASE_VT(VT_UI4, UINT32, V_UI4); \ CASE_VT(VT_R4, float, V_R4); \ CASE_VT(VT_BSTR, BSTR, V_BSTR); \ + CASE_VT(VT_DISPATCH, IDispatch*, V_DISPATCH); \ CASE_VT(VT_BOOL, VARIANT_BOOL, V_BOOL) /* List all types used by IDispatchEx-based properties */ @@ -234,7 +235,6 @@ HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo) CASE_VT(VT_VARIANT, VARIANT, *); \ CASE_VT(VT_PTR, void*, V_BYREF); \ CASE_VT(VT_UNKNOWN, IUnknown*, V_UNKNOWN); \ - CASE_VT(VT_DISPATCH, IDispatch*, V_DISPATCH); \ CASE_VT(VT_UI8, ULONGLONG, V_UI8) static BOOL is_arg_type_supported(VARTYPE vt)

1 0

Jacek Caban : mshtml: Support type conversion in functions with arguments using default values.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 64ff525b6a4536f4cf2b95268e583ca7b23534c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ff525b6a4536f4cf2b9526… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 16:38:38 2019 +0200 mshtml: Support type conversion in functions with arguments using default values. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 02ba5d4..e1c33b9 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -49,6 +49,10 @@ static CRITICAL_SECTION cs_dispex_static_data = { &cs_dispex_static_data_dbg, -1 static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; typedef struct { + VARIANT default_value; +} func_arg_info_t; + +typedef struct { DISPID id; BSTR name; tid_t tid; @@ -58,8 +62,10 @@ typedef struct { SHORT get_vtbl_off; SHORT func_disp_idx; USHORT argc; + USHORT default_value_cnt; VARTYPE prop_vt; VARTYPE *arg_types; + func_arg_info_t *arg_info; } func_info_t; struct dispex_data_t { @@ -165,14 +171,21 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) void release_typelib(void) { dispex_data_t *iter; - unsigned i; + unsigned i, j; while(!list_empty(&dispex_data_list)) { iter = LIST_ENTRY(list_head(&dispex_data_list), dispex_data_t, entry); list_remove(&iter->entry); - for(i=0; i < iter->func_cnt; i++) + for(i = 0; i < iter->func_cnt; i++) { + if(iter->funcs[i].default_value_cnt && iter->funcs[i].arg_info) { + for(j = 0; j < iter->funcs[i].argc; j++) + VariantClear(&iter->funcs[i].arg_info[j].default_value); + } + heap_free(iter->funcs[i].arg_types); + heap_free(iter->funcs[i].arg_info); SysFreeString(iter->funcs[i].name); + } heap_free(iter->funcs); heap_free(iter->name_table); @@ -283,7 +296,11 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, info->arg_types = heap_alloc(sizeof(*info->arg_types) * info->argc); if(!info->arg_types) - return; /* FIXME: real error instead of fallback */ + return; + info->arg_info = heap_alloc_zero(sizeof(*info->arg_info) * info->argc); + if(!info->arg_types) + return; + for(i=0; i < info->argc; i++) info->arg_types[i] = desc->lprgelemdescParam[i].tdesc.vt; @@ -305,8 +322,15 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, } if(desc->lprgelemdescParam[i].u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) { - TRACE("%s param %d: default value\n", debugstr_w(info->name), i); - return; /* Fallback to ITypeInfo::Invoke */ + hres = VariantCopy(&info->arg_info[i].default_value, + &desc->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); + if(FAILED(hres)) { + ERR("Could not copy default value: %08x\n", hres); + return; + } + TRACE("%s param %d: default value %s\n", debugstr_w(info->name), + i, debugstr_variant(&info->arg_info[i].default_value)); + info->default_value_cnt++; } } @@ -1090,7 +1114,7 @@ static HRESULT invoke_builtin_function(DispatchEx *This, func_info_t *func, DISP return E_NOTIMPL; } - if(dp->cArgs != func->argc) { + if(dp->cArgs > func->argc || dp->cArgs + func->default_value_cnt < func->argc) { FIXME("Invalid argument count (expected %u, got %u)\n", func->argc, dp->cArgs); return E_INVALIDARG; } @@ -1100,6 +1124,11 @@ static HRESULT invoke_builtin_function(DispatchEx *This, func_info_t *func, DISP return hres; for(i=0; i < func->argc; i++) { + if(i >= dp->cArgs) { + /* use default value */ + arg_ptrs[i] = &func->arg_info[i].default_value; + continue; + } arg = dp->rgvarg+dp->cArgs-i-1; if(func->arg_types[i] == V_VT(arg)) { arg_ptrs[i] = arg;

1 0

Gijs Vermeulen : ntoskrnl.exe: Add Ex[p]InterlockedFlushSList.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 7d32c24c4ac2a68419608b26aa6de393dbbffd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d32c24c4ac2a68419608b26… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Apr 15 00:55:33 2019 +0200 ntoskrnl.exe: Add Ex[p]InterlockedFlushSList. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 3 ++- dlls/ntoskrnl.exe/sync.c | 10 ++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ab952e5..141c8aa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -4,7 +4,7 @@ @ stub ExInitializeRundownProtection @ stub ExInterlockedAddLargeStatistic @ stub ExInterlockedCompareExchange64 -@ stub ExInterlockedFlushSList +@ stdcall -fastcall -arch=i386 ExInterlockedFlushSList(ptr) NTOSKRNL_ExInterlockedFlushSList @ stdcall -fastcall -arch=i386 ExInterlockedPopEntrySList(ptr ptr) NTOSKRNL_ExInterlockedPopEntrySList @ stdcall -fastcall -arch=i386 ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection @@ -27,6 +27,7 @@ @ stub Exfi386InterlockedDecrementLong @ stub Exfi386InterlockedExchangeUlong @ stub Exfi386InterlockedIncrementLong +@ stdcall -arch=win64 ExpInterlockedFlushSList(ptr) RtlInterlockedFlushSList @ stdcall -arch=win64 ExpInterlockedPopEntrySList(ptr) RtlInterlockedPopEntrySList @ stdcall -arch=win64 ExpInterlockedPushEntrySList(ptr ptr) RtlInterlockedPushEntrySList @ stub HalExamineMBR diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index fbe9dbe..6976b9e 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -691,6 +691,16 @@ PSLIST_ENTRY WINAPI NTOSKRNL_ExInterlockedPushEntrySList( PSLIST_HEADER list, PS /*********************************************************************** + * ExInterlockedFlushSList (NTOSKRNL.EXE.@) + */ +DEFINE_FASTCALL1_WRAPPER( NTOSKRNL_ExInterlockedFlushSList ) +PSLIST_ENTRY WINAPI NTOSKRNL_ExInterlockedFlushSList( PSLIST_HEADER list ) +{ + return RtlInterlockedFlushSList( list ); +} + + +/*********************************************************************** * ExAcquireFastMutexUnsafe (NTOSKRNL.EXE.@) */ DEFINE_FASTCALL1_WRAPPER(ExAcquireFastMutexUnsafe) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0faf5ec..a66a582 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1528,6 +1528,7 @@ ULONG WINAPI ExGetExclusiveWaiterCount(ERESOURCE*); ULONG WINAPI ExGetSharedWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); +PSLIST_ENTRY WINAPI ExInterlockedFlushSList(PSLIST_HEADER); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*);

1 0

Gijs Vermeulen : riched20: Handle tomEnd in ITextRange::ScrollIntoView.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 840af642dbf8a222fdd9f40256db0a84c5279fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=840af642dbf8a222fdd9f402… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Apr 15 12:14:15 2019 +0200 riched20: Handle tomEnd in ITextRange::ScrollIntoView. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46899 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 4 ++++ dlls/riched20/tests/richole.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 93003eb..4b47310 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2485,6 +2485,10 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) ME_CursorFromCharOfs(editor, This->start, &cursor); ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); break; + case tomEnd: + ME_CursorFromCharOfs(editor, This->end, &cursor); + ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + break; default: FIXME("bStart value %d not handled\n", value); return E_NOTIMPL; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d9c7fa1..40feb76 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -853,15 +853,19 @@ static void test_ITextRange_ScrollIntoView(void) /* Scroll to the top. */ check_range(w, txtDoc, 0, 1, tomStart, 0); + check_range(w, txtDoc, 0, 1, tomEnd, 0); /* Scroll to the bottom. */ check_range(w, txtDoc, 19, 20, tomStart, 1); + check_range(w, txtDoc, 19, 20, tomEnd, 1); /* Back up to the top. */ check_range(w, txtDoc, 0, 1, tomStart, 0); + check_range(w, txtDoc, 0, 1, tomEnd, 0); /* Large range */ check_range(w, txtDoc, 0, 20, tomStart, 0); + check_range(w, txtDoc, 0, 20, tomEnd, 1); hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres);

1 0

Alexandre Julliard : shell32: Fix compiler warnings for the Windows build.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 06c7d3a945087cc1540cbd5a94eefc6b78168368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06c7d3a945087cc1540cbd5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 15 13:15:38 2019 +0200 shell32: Fix compiler warnings for the Windows build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 4 ++-- dlls/shell32/trash.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 732a103..a37b1bf 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -165,10 +165,10 @@ #include "pidl.h" #include "debughlp.h" -WINE_DEFAULT_DEBUG_CHANNEL(shell); - #if !defined(__MINGW32__) && !defined(_MSC_VER) +WINE_DEFAULT_DEBUG_CHANNEL(shell); + #define LEN_SHITEMID_FIXED_PART ((USHORT) \ ( sizeof(USHORT) /* SHITEMID's cb field. */ \ + sizeof(PIDLTYPE) /* PIDLDATA's type field. */ \ diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index fc75c17..93b4ee4 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <stdio.h>

1 0

Nikolay Sivov : include: Add IMFPMediaPlayer definition.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 68f15fe36b7ef6ad1be60cafe37be0d1f8b43531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68f15fe36b7ef6ad1be60caf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 15 08:35:27 2019 +0300 include: Add IMFPMediaPlayer definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/evr.idl | 11 +++ include/mfplay.idl | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 74198af..09c84d8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -370,6 +370,7 @@ SOURCES = \ mferror.h \ mfidl.idl \ mfobjects.idl \ + mfplay.idl \ mfreadwrite.idl \ mftransform.idl \ midles.h \ diff --git a/include/evr.idl b/include/evr.idl index 22f745e..3768b41 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -25,6 +25,17 @@ import "mftransform.idl"; import "mediaobj.idl"; import "strmif.idl"; +cpp_quote("#ifndef _MFVideoNormalizedRect_") +cpp_quote("#define _MFVideoNormalizedRect_") +typedef struct MFVideoNormalizedRect +{ + float left; + float top; + float right; + float bottom; +} MFVideoNormalizedRect; +cpp_quote("#endif") + typedef enum _MFVP_MESSAGE_TYPE { MFVP_MESSAGE_FLUSH, MFVP_MESSAGE_INVALIDATEMEDIATYPE, diff --git a/include/mfplay.idl b/include/mfplay.idl new file mode 100644 index 0000000..415a6f5 --- /dev/null +++ b/include/mfplay.idl @@ -0,0 +1,202 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "propsys.idl"; +import "evr.idl"; + +typedef [v1_enum] enum _MFP_CREATION_OPTIONS +{ + MFP_OPTION_NONE = 0, + MFP_OPTION_FREE_THREADED_CALLBACK = 0x1, + MFP_OPTION_NO_MMCSS = 0x2, + MFP_OPTION_NO_REMOTE_DESKTOP_OPTIMIZATION = 0x4, +} MFP_CREATION_OPTIONS; + +typedef [v1_enum] enum MFP_MEDIAPLAYER_STATE +{ + MFP_MEDIAPLAYER_STATE_EMPTY = 0, + MFP_MEDIAPLAYER_STATE_STOPPED, + MFP_MEDIAPLAYER_STATE_PLAYING, + MFP_MEDIAPLAYER_STATE_PAUSED, + MFP_MEDIAPLAYER_STATE_SHUTDOWN, +} MFP_MEDIAPLAYER_STATE; + +typedef enum MFP_EVENT_TYPE +{ + MFP_EVENT_TYPE_PLAY = 0, + MFP_EVENT_TYPE_PAUSE, + MFP_EVENT_TYPE_STOP, + MFP_EVENT_TYPE_POSITION_SET, + MFP_EVENT_TYPE_RATE_SET, + MFP_EVENT_TYPE_MEDIAITEM_CREATED, + MFP_EVENT_TYPE_MEDIAITEM_SET, + MFP_EVENT_TYPE_FRAME_STEP, + MFP_EVENT_TYPE_MEDIAITEM_CLEARED, + MFP_EVENT_TYPE_MF, + MFP_EVENT_TYPE_ERROR, + MFP_EVENT_TYPE_PLAYBACK_ENDED, + MFP_EVENT_TYPE_ACQUIRE_USER_CREDENTIAL, +} MFP_EVENT_TYPE; + +interface IMFPMediaPlayer; +interface IMFPMediaItem; + +typedef struct MFP_EVENT_HEADER +{ + MFP_EVENT_TYPE eEventType; + HRESULT hrEvent; + IMFPMediaPlayer *pMediaPlayer; + MFP_MEDIAPLAYER_STATE eState; + IPropertyStore *pPropertyStore; +} MFP_EVENT_HEADER; + +[ + object, + uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd), + local, +] +interface IMFPMediaPlayerCallback : IUnknown +{ + void OnMediaPlayerEvent([in] MFP_EVENT_HEADER *event_header); +} + +[ + object, + uuid(a714590a-58af-430a-85bf-44f5ec838d85), + local, +] +interface IMFPMediaPlayer : IUnknown +{ + HRESULT Play(); + + HRESULT Pause(); + + HRESULT Stop(); + + HRESULT FrameStep(); + + HRESULT SetPosition( + [in] REFGUID position_type, + [in] const PROPVARIANT *position); + + HRESULT GetPosition( + [in] REFGUID position_type, + [out] PROPVARIANT *position); + + HRESULT GetDuration( + [in] REFGUID position_type, + [out] PROPVARIANT *duration); + + HRESULT SetRate( + [in] float rate); + + HRESULT GetRate( + [out] float *rate); + + HRESULT GetSupportedRates( + [in] BOOL forward, + [out] float *slowest_rate, + [out] float *fastest_rate); + + HRESULT GetState( + [out] MFP_MEDIAPLAYER_STATE *state); + + HRESULT CreateMediaItemFromURL( + [in] const WCHAR *url, + [in] BOOL sync, + [in] DWORD_PTR user_data, + [out] IMFPMediaItem **item); + + HRESULT CreateMediaItemFromObject( + [in] IUnknown *object, + [in] BOOL sync, + [in] DWORD_PTR user_data, + [out] IMFPMediaItem **item); + + HRESULT SetMediaItem( + [in] IMFPMediaItem *item); + + HRESULT ClearMediaItem(); + + HRESULT GetMediaItem( + [out] IMFPMediaItem **item); + + HRESULT GetVolume( + [out] float *volume); + + HRESULT SetVolume( + [in] float volume); + + HRESULT GetBalance( + [out] float *balance); + + HRESULT SetBalance( + [in] float balance); + + HRESULT GetMute( + [out] BOOL *mute); + + HRESULT SetMute( + [in] BOOL mute); + + HRESULT GetNativeVideoSize( + [out] SIZE *video, + [out] SIZE *arvideo); + + HRESULT GetIdealVideoSize( + [out] SIZE *min_size, + [out] SIZE *max_size); + + HRESULT SetVideoSourceRect( + [in] MFVideoNormalizedRect const *rect); + + HRESULT GetVideoSourceRect( + [out] MFVideoNormalizedRect *rect); + + HRESULT SetAspectRatioMode( + [in] DWORD mode); + + HRESULT GetAspectRatioMode( + [out] DWORD *mode); + + HRESULT GetVideoWindow( + [out] HWND *hwnd); + + HRESULT UpdateVideo(); + + HRESULT SetBorderColor( + [in] COLORREF color); + + HRESULT GetBorderColor( + [out] COLORREF *color); + + HRESULT InsertEffect( + [in] IUnknown *effect, + [in] BOOL optional); + + HRESULT RemoveEffect( + [in] IUnknown *effect); + + HRESULT RemoveAllEffects(); + + HRESULT Shutdown(); +} + +cpp_quote("HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, ") +cpp_quote(" IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player);")

1 0

Vijay Kiran Kamuju : qwave: Add stub for QOSCreateHandle and tests.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 9c44ef5b565464646063a7bf600654163b92921f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c44ef5b565464646063a7bf… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Apr 12 05:21:09 2019 +0200 qwave: Add stub for QOSCreateHandle and tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46174 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/qwave/Makefile.in | 1 + dlls/qwave/main.c | 12 ++++++++ dlls/qwave/qwave.spec | 2 +- dlls/qwave/tests/Makefile.in | 5 +++ dlls/qwave/tests/qos.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 93 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 3e87c86..451c92d 100755 --- a/configure +++ b/configure @@ -20569,6 +20569,7 @@ wine_fn_config_makefile dlls/quartz enable_quartz wine_fn_config_makefile dlls/quartz/tests enable_tests wine_fn_config_makefile dlls/query enable_query wine_fn_config_makefile dlls/qwave enable_qwave +wine_fn_config_makefile dlls/qwave/tests enable_tests wine_fn_config_makefile dlls/rasapi16.dll16 enable_win16 wine_fn_config_makefile dlls/rasapi32 enable_rasapi32 wine_fn_config_makefile dlls/rasapi32/tests enable_tests diff --git a/configure.ac b/configure.ac index 719afe6..611dc69 100644 --- a/configure.ac +++ b/configure.ac @@ -3603,6 +3603,7 @@ WINE_CONFIG_MAKEFILE(dlls/quartz) WINE_CONFIG_MAKEFILE(dlls/quartz/tests) WINE_CONFIG_MAKEFILE(dlls/query) WINE_CONFIG_MAKEFILE(dlls/qwave) +WINE_CONFIG_MAKEFILE(dlls/qwave/tests) WINE_CONFIG_MAKEFILE(dlls/rasapi16.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/rasapi32) WINE_CONFIG_MAKEFILE(dlls/rasapi32/tests) diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in index 9de8224..5b4015c 100644 --- a/dlls/qwave/Makefile.in +++ b/dlls/qwave/Makefile.in @@ -1,4 +1,5 @@ MODULE = qwave.dll +IMPORTLIB = qwave C_SRCS = \ main.c diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index ce1cfbd..6d77b29 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -1,5 +1,6 @@ /* * Copyright 2018 Louis Lenders + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "qos2.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qwave); @@ -39,3 +41,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) } return TRUE; } + +BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle) +{ + FIXME("%p %p stub!\n", version, handle); + if (!version || !((version->MajorVersion == 1) && (version->MinorVersion == 0)) || !handle) + SetLastError(ERROR_INVALID_PARAMETER); + else + SetLastError(ERROR_SERVICE_ALREADY_RUNNING); + return FALSE; +} diff --git a/dlls/qwave/qwave.spec b/dlls/qwave/qwave.spec index 27b07f5..94b62eb 100644 --- a/dlls/qwave/qwave.spec +++ b/dlls/qwave/qwave.spec @@ -3,7 +3,7 @@ @ stub QOSAddSocketToFlow @ stub QOSCancel @ stub QOSCloseHandle -@ stub QOSCreateHandle +@ stdcall QOSCreateHandle(ptr ptr) @ stub QOSEnumerateFlows @ stub QOSNotifyFlow @ stub QOSQueryFlow diff --git a/dlls/qwave/tests/Makefile.in b/dlls/qwave/tests/Makefile.in new file mode 100644 index 0000000..713909b --- /dev/null +++ b/dlls/qwave/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = qwave.dll +IMPORTS = qwave + +C_SRCS = \ + qos.c diff --git a/dlls/qwave/tests/qos.c b/dlls/qwave/tests/qos.c new file mode 100644 index 0000000..5cb3e53 --- /dev/null +++ b/dlls/qwave/tests/qos.c @@ -0,0 +1,72 @@ +/* + * Copyright 2019 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include "qos2.h" + +#include "wine/test.h" + +static void test_QOSCreateHandle(void) +{ + QOS_VERSION ver; + HANDLE h; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = QOSCreateHandle(NULL, NULL); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = QOSCreateHandle(&ver, NULL); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ver.MajorVersion = 0; + ver.MinorVersion = 0; + ret = QOSCreateHandle(&ver, &h); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ver.MajorVersion = 1; + ver.MinorVersion = 0; + ret = QOSCreateHandle(&ver, &h); + todo_wine ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ver.MajorVersion = 1; + ver.MinorVersion = 5; + ret = QOSCreateHandle(&ver, &h); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ver.MajorVersion = 2; + ver.MinorVersion = 0; + ret = QOSCreateHandle(&ver, &h); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); +} + +START_TEST(qos) +{ + test_QOSCreateHandle(); +}

1 0

Vijay Kiran Kamuju : include: Add missing includes, functions to qos2.h.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: fb1695a25406cf88298ffe41a237fdc8b1d75a10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb1695a25406cf88298ffe41… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Apr 12 05:21:08 2019 +0200 include: Add missing includes, functions to qos2.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/qos2.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/include/qos2.h b/include/qos2.h index ac486f7..fa2ce80 100644 --- a/include/qos2.h +++ b/include/qos2.h @@ -19,11 +19,14 @@ #ifndef __WINE_QOS2_H__ #define __WINE_QOS2_H__ +#include <ws2tcpip.h> +#include <mstcpip.h> + #ifdef __cplusplus extern "C" { #endif -typedef UINT32 QOS_FLOWID; +typedef ULONG QOS_FLOWID, *PQOS_FLOWID; typedef enum _QOS_SHAPING { QOSShapeOnly, @@ -93,6 +96,27 @@ typedef struct _QOS_VERSION { USHORT MinorVersion; } QOS_VERSION, *PQOS_VERSION; +#define QOS_OUTGOING_DEFAULT_MINIMUM_BANDWIDTH 0xFFFFFFFF + +#define QOS_QUERYFLOW_FRESH 0x00000001 +#define QOS_NON_ADAPTIVE_FLOW 0x00000002 + +BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, + QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid); +BOOL WINAPI QOSCancel(HANDLE handle, LPOVERLAPPED overlap); +BOOL WINAPI QOSCloseHandle(HANDLE handle); +BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle); +BOOL WINAPI QOSEnumerateFlows(HANDLE handle, PULONG size, PVOID buffer); +BOOL WINAPI QOSNotifyFlow(HANDLE handle, QOS_FLOWID flowid, QOS_NOTIFY_FLOW op, PULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSQueryFlow(HANDLE handle, QOS_FLOWID flowid, QOS_QUERY_FLOW op, PULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSRemoveSocketFromFlow(HANDLE handle, SOCKET socket, QOS_FLOWID flowid, DWORD flags); +BOOL WINAPI QOSSetFlow(HANDLE handle, QOS_FLOWID flowid, QOS_SET_FLOW op, ULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSStartTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags); +BOOL WINAPI QOSStopTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags); + #ifdef __cplusplus } #endif

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
81
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 April 2019