April 2019 - Wine-Commits - list.winehq.org

Vijay Kiran Kamuju : uianimation: Add stub dll.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 9a562d963f3994c9ee61ae5181133895147aabac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a562d963f3994c9ee61ae51… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Mar 29 23:05:20 2019 +0100 uianimation: Add stub dll. Based on a patch from Louis Lenders Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/uianimation/Makefile.in | 4 ++++ dlls/uianimation/main.c | 46 +++++++++++++++++++++++++++++++++++++++ dlls/uianimation/uianimation.spec | 4 ++++ 5 files changed, 57 insertions(+) diff --git a/configure b/configure index 44d97a8..6f9013c 100755 --- a/configure +++ b/configure @@ -1564,6 +1564,7 @@ enable_traffic enable_twain_32 enable_tzres enable_ucrtbase +enable_uianimation enable_uiautomationcore enable_uiribbon enable_unicows @@ -19970,6 +19971,7 @@ wine_fn_config_makefile dlls/typelib.dll16 enable_win16 wine_fn_config_makefile dlls/tzres enable_tzres wine_fn_config_makefile dlls/ucrtbase enable_ucrtbase wine_fn_config_makefile dlls/ucrtbase/tests enable_tests +wine_fn_config_makefile dlls/uianimation enable_uianimation wine_fn_config_makefile dlls/uiautomationcore enable_uiautomationcore wine_fn_config_makefile dlls/uiautomationcore/tests enable_tests wine_fn_config_makefile dlls/uiribbon enable_uiribbon diff --git a/configure.ac b/configure.ac index d5640ed..6c72566 100644 --- a/configure.ac +++ b/configure.ac @@ -3691,6 +3691,7 @@ WINE_CONFIG_MAKEFILE(dlls/typelib.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/tzres) WINE_CONFIG_MAKEFILE(dlls/ucrtbase) WINE_CONFIG_MAKEFILE(dlls/ucrtbase/tests) +WINE_CONFIG_MAKEFILE(dlls/uianimation) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore/tests) WINE_CONFIG_MAKEFILE(dlls/uiribbon) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in new file mode 100644 index 0000000..b504181 --- /dev/null +++ b/dlls/uianimation/Makefile.in @@ -0,0 +1,4 @@ +MODULE = uianimation.dll + +C_SRCS = \ + main.c diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c new file mode 100644 index 0000000..0fa9bfb --- /dev/null +++ b/dlls/uianimation/main.c @@ -0,0 +1,46 @@ +/* + * Uianimation main file. + * + * Copyright (C) 2018 Louis Lenders + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "uianimation.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uianimation); + +BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p %d %p)\n", dll, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( dll ); + break; + } + return TRUE; +} diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec new file mode 100644 index 0000000..a43b12d --- /dev/null +++ b/dlls/uianimation/uianimation.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow() +@ stub DllGetClassObject(ptr ptr ptr) +@ stub DllRegisterServer() +@ stub DllUnregisterServer()

1 0

Zebediah Figura : rpcrt4: Detect enums and aliases in get_base_type().
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: d97b421b92665b33d0b5e15960b10522eaadb2eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97b421b92665b33d0b5e159… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 23:31:13 2019 -0500 rpcrt4: Detect enums and aliases in get_base_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 8a08ad9..d8c429b 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -106,9 +106,13 @@ static unsigned short write_oleaut_tfs(VARTYPE vt) return 0; } -static unsigned char get_base_type(VARTYPE vt) +static unsigned char get_basetype(ITypeInfo *typeinfo, TYPEDESC *desc) { - switch (vt) + ITypeInfo *refinfo; + unsigned char ret; + TYPEATTR *attr; + + switch (desc->vt) { case VT_I1: return FC_SMALL; case VT_BOOL: @@ -126,6 +130,18 @@ static unsigned char get_base_type(VARTYPE vt) case VT_R4: return FC_FLOAT; case VT_DATE: case VT_R8: return FC_DOUBLE; + case VT_USERDEFINED: + ITypeInfo_GetRefTypeInfo(typeinfo, desc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + if (attr->typekind == TKIND_ENUM) + ret = FC_ENUM32; + else if (attr->typekind == TKIND_ALIAS) + ret = get_basetype(refinfo, &attr->tdescAlias); + else + ret = 0; + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + return ret; default: return 0; } } @@ -210,7 +226,7 @@ static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr) fc = FC_BOGUS_STRUCT; break; default: - if (!get_base_type(vt)) + if (!get_basetype(typeinfo, &desc->elemdescVar.tdesc)) { FIXME("unhandled type %u\n", vt); fc = FC_BOGUS_STRUCT; @@ -226,7 +242,7 @@ static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr) static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) { - if (get_base_type(desc->vt)) + if (get_basetype(typeinfo, desc)) return FC_LGFARRAY; else if (desc->vt == VT_USERDEFINED) { @@ -283,7 +299,7 @@ static size_t write_array_tfs(ITypeInfo *typeinfo, unsigned char *str, if (fc != FC_LGFARRAY) FIXME("complex arrays not implemented\n"); - if (!(basetype = get_base_type(desc->tdescElem.vt))) + if (!(basetype = get_basetype(typeinfo, &desc->tdescElem))) ref = write_type_tfs(typeinfo, str, len, &desc->tdescElem, FALSE, FALSE); /* In theory arrays should be nested, but there's no reason not to marshal @@ -401,7 +417,7 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, ITypeInfo_ReleaseTypeAttr(refinfo, attr); ITypeInfo_Release(refinfo); } - else if ((basetype = get_base_type(desc->vt))) + else if ((basetype = get_basetype(typeinfo, desc))) { assert(!toplevel); /* toplevel base-type pointers should use IsSimpleRef */ WRITE_CHAR(str, *len, FC_UP); @@ -466,7 +482,7 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, break; default: /* base types are always embedded directly */ - assert(!get_base_type(desc->vt)); + assert(!get_basetype(typeinfo, desc)); FIXME("unhandled type %u\n", desc->vt); off = *len; WRITE_SHORT(str, *len, 0); @@ -584,7 +600,7 @@ static HRESULT get_param_pointer_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int *tfs_tdesc = tdesc; if (!is_in && is_out) *server_size = type_memsize(typeinfo, tdesc); - if ((*basetype = get_base_type(tdesc->vt))) + if ((*basetype = get_basetype(typeinfo, tdesc))) *flags |= IsBasetype; break; } @@ -662,7 +678,7 @@ static HRESULT get_param_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int is_in, ITypeInfo_Release(refinfo); break; default: - if ((*basetype = get_base_type(tdesc->vt))) + if ((*basetype = get_basetype(typeinfo, tdesc))) *flags |= IsBasetype; else { @@ -749,7 +765,7 @@ static void write_proc_func_header(ITypeInfo *typeinfo, FUNCDESC *desc, WRITE_SHORT(proc, *proclen, 0); /* NotifyIndex */ for (param_idx = 0; param_idx < desc->cParams && param_idx < 3; param_idx++) { - basetype = get_base_type(desc->lprgelemdescParam[param_idx].tdesc.vt); + basetype = get_basetype(typeinfo, &desc->lprgelemdescParam[param_idx].tdesc); if (basetype == FC_FLOAT) float_mask |= (1 << ((param_idx + 1) * 2)); else if (basetype == FC_DOUBLE)

1 0

Zebediah Figura : rpcrt4: Factor out type_pointer_is_iface().
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 7eb670825188969dda42790d187210fad601f8b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eb670825188969dda42790d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 23:31:14 2019 -0500 rpcrt4: Factor out type_pointer_is_iface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index d8c429b..f182f1a 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -205,6 +205,29 @@ static unsigned int type_memsize(ITypeInfo *typeinfo, TYPEDESC *desc) } } +static BOOL type_pointer_is_iface(ITypeInfo *typeinfo, TYPEDESC *tdesc) +{ + ITypeInfo *refinfo; + BOOL ret = FALSE; + TYPEATTR *attr; + + if (tdesc->vt == VT_USERDEFINED) + { + ITypeInfo_GetRefTypeInfo(typeinfo, tdesc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + + if (attr->typekind == TKIND_INTERFACE + || attr->typekind == TKIND_DISPATCH + || attr->typekind == TKIND_COCLASS) + ret = TRUE; + + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + } + + return ret; +} + static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc); static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr) @@ -530,26 +553,10 @@ static HRESULT get_param_pointer_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int break; case VT_PTR: *flags |= MustFree; - - if (tdesc->lptdesc->vt == VT_USERDEFINED) + if (type_pointer_is_iface(typeinfo, tdesc->lptdesc)) { - ITypeInfo_GetRefTypeInfo(typeinfo, tdesc->lptdesc->hreftype, &refinfo); - ITypeInfo_GetTypeAttr(refinfo, &attr); - - switch (attr->typekind) - { - case TKIND_INTERFACE: - case TKIND_DISPATCH: - case TKIND_COCLASS: - if (is_in && is_out) - *server_size = sizeof(void *); - break; - default: + if (is_in && is_out) *server_size = sizeof(void *); - } - - ITypeInfo_ReleaseTypeAttr(refinfo, attr); - ITypeInfo_Release(refinfo); } else *server_size = sizeof(void *);

1 0

Alexandre Julliard : msvcp: Use C runtime wchar functions instead of wine/ unicode.h.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: f0fbf6f584b2b8b74d6efcccc7ee4e0f5202a2a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0fbf6f584b2b8b74d6efccc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 12:20:30 2019 +0200 msvcp: Use C runtime wchar functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 068e81e..08d8737 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -34,7 +34,6 @@ #include "winbase.h" #include "winnls.h" #include "msvcp90.h" -#include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" @@ -2004,7 +2003,7 @@ int __cdecl _Tolower(int ch, const _Ctypevec *ctype) if(!MultiByteToWideChar(cp, MB_ERR_INVALID_CHARS, str, size, &wide, 1)) return ch; - lower = tolowerW(wide); + lower = towlower(wide); if(lower == wide) return ch; @@ -2100,7 +2099,7 @@ int __cdecl _Toupper(int ch, const _Ctypevec *ctype) if(!MultiByteToWideChar(cp, MB_ERR_INVALID_CHARS, str, size, &wide, 1)) return ch; - upper = toupperW(wide); + upper = towupper(wide); if(upper == wide) return ch; @@ -2770,7 +2769,7 @@ MSVCP_size_t __cdecl ctype_short__Getcat_old(const locale_facet **facet) wchar_t __cdecl _Towlower(wchar_t ch, const _Ctypevec *ctype) { TRACE("(%d %p)\n", ch, ctype); - return tolowerW(ch); + return towlower(ch); } ctype_wchar* ctype_wchar_use_facet(const locale *loc) @@ -2896,7 +2895,7 @@ const wchar_t* __thiscall ctype_wchar_tolower(const ctype_wchar *this, wchar_t __cdecl _Towupper(wchar_t ch, const _Ctypevec *ctype) { TRACE("(%d %p)\n", ch, ctype); - return toupperW(ch); + return towupper(ch); } /* ?do_toupper@?$ctype(a)_W@std@@MBE_W_W(a)Z */ @@ -10650,7 +10649,7 @@ static wchar_t* create_time_get_str(const wchar_t *str) wchar_t *ret; int len; - len = strlenW(str)+1; + len = lstrlenW(str)+1; ret = MSVCRT_operator_new(len * sizeof(wchar_t)); if(ret) memcpy(ret, str, len*sizeof(wchar_t)); @@ -10944,9 +10943,9 @@ static int find_longest_match_wchar(istreambuf_iterator_wchar *iter, const wchar match = -1; for(p=str+1, i=0; *p; p = (*end ? end+1 : end), i++) { - end = strchrW(p, ':'); + end = wcschr(p, ':'); if (!end) - end = p + strlenW(p); + end = p + lstrlenW(p); if (end-p >= len && !memcmp(p, buf, len*sizeof(wchar_t))) {

1 0

Alexandre Julliard : wordpad: Use C runtime wchar functions instead of wine/unicode.h.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 83c99c021983dda6f8ac6d4ce4d8c64f594784a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83c99c021983dda6f8ac6d4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 12:41:50 2019 +0200 wordpad: Use C runtime wchar functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 1ced34c..546d0b0 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -36,7 +36,6 @@ #include <math.h> #include <errno.h> -#include "wine/unicode.h" #include "wordpad.h" #ifdef NONAMELESSUNION @@ -1383,7 +1382,7 @@ static void number_with_units(LPWSTR buffer, int number) static const WCHAR fmt[] = {'%','.','2','f',' ','%','s','\0'}; float converted = (float)number / (float)TWIPS_PER_INCH *(float)CENTMM_PER_INCH / 1000.0; - sprintfW(buffer, fmt, converted, units_cmW); + swprintf(buffer, fmt, converted, units_cmW); } static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength)

1 0

Alexandre Julliard : libwine: Move string functions to libwine_port.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: c3398b7eab645321a7ec489832ca035ca5b94942 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3398b7eab645321a7ec4898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 10:03:38 2019 +0100 libwine: Move string functions to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/{wine => port}/string.c | 3 +-- libs/wine/Makefile.in | 3 +-- libs/wine/port.c | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index ef3b23f..18cbf79 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -101,6 +101,7 @@ C_SRCS = \ sortkey.c \ spawn.c \ statvfs.c \ + string.c \ strnlen.c \ symlink.c \ usleep.c \ diff --git a/libs/wine/string.c b/libs/port/string.c similarity index 99% rename from libs/wine/string.c rename to libs/port/string.c index 7aa981f..c3388bc 100644 --- a/libs/wine/string.c +++ b/libs/port/string.c @@ -23,7 +23,6 @@ #include <limits.h> #include <stdio.h> -#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) @@ -473,7 +472,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) *fmta = '\0'; if (*iter == 'a' || *iter == 'A' || *iter == 'e' || *iter == 'E' || - *iter == 'f' || *iter == 'F' || + *iter == 'f' || *iter == 'F' || *iter == 'g' || *iter == 'G') sprintf(bufaiter, fmtbufa, va_arg(valist, double)); else diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index bd8a937..6525a53 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -6,8 +6,7 @@ C_SRCS = \ ldt.c \ loader.c \ mmap.c \ - port.c \ - string.c + port.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 666c4ca..e954e5b 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -25,6 +25,7 @@ #include <string.h> #include <sys/types.h> +#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" #include "wine/library.h" @@ -33,6 +34,8 @@ #ifndef __ANDROID__ const void *libwine_port_functions[] = { + strtolW, + vsnprintfW, wine_compare_string, wine_cp_enum_table, wine_cp_get_table,

1 0

Alexandre Julliard : include: Disallow using unicode.h when building against msvcrt.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: b278caf1528c5d88b641273453eeb78a40e9d100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b278caf1528c5d88b6412734… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 12:21:25 2019 +0200 include: Disallow using unicode.h when building against msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 4 ++++ programs/xcopy/xcopy.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 22bb6dd..ff6f656 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -31,6 +31,10 @@ #error This file should not be used in Wine tests #endif +#ifdef __WINE_USE_MSVCRT +#error This file should not be used with msvcrt headers +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index eb8c3f0..0d31d7c 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -46,7 +46,6 @@ #include <stdlib.h> #include <windows.h> #include <wine/debug.h> -#include <wine/unicode.h> #include "xcopy.h" WINE_DEFAULT_DEBUG_CHANNEL(xcopy);

1 0

Nikolay Sivov : mfplat: Partially implement MFCreateWaveFormatExFromMFMediaType() for PCM format.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 261995d1662aeb4202a74b15fe87d6ed65313990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=261995d1662aeb4202a74b15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:01 2019 +0300 mfplat: Partially implement MFCreateWaveFormatExFromMFMediaType() for PCM format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 67 ++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 7 +++++ 4 files changed, 152 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index dddea4b..6a8bd97 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -20,6 +20,10 @@ #include "mfplat_private.h" +#include "initguid.h" +#include "ks.h" +#include "ksmedia.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -1679,3 +1683,76 @@ HRESULT WINAPI MFUnwrapMediaType(IMFMediaType *wrapper, IMFMediaType **ret) return S_OK; } + +/*********************************************************************** + * MFCreateWaveFormatExFromMFMediaType (mfplat.@) + */ +HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVEFORMATEX **ret_format, + UINT32 *size, UINT32 flags) +{ + WAVEFORMATEXTENSIBLE *format_ext = NULL; + WAVEFORMATEX *format; + GUID major, subtype; + UINT32 value; + HRESULT hr; + + TRACE("%p, %p, %p, %#x.\n", mediatype, ret_format, size, flags); + + if (FAILED(hr = IMFMediaType_GetGUID(mediatype, &MF_MT_MAJOR_TYPE, &major))) + return hr; + + if (FAILED(hr = IMFMediaType_GetGUID(mediatype, &MF_MT_SUBTYPE, &subtype))) + return hr; + + if (!IsEqualGUID(&major, &MFMediaType_Audio)) + return E_INVALIDARG; + + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM)) + { + FIXME("Unsupported audio format %s.\n", debugstr_guid(&subtype)); + return E_NOTIMPL; + } + + /* FIXME: probably WAVE_FORMAT_MPEG/WAVE_FORMAT_MPEGLAYER3 should be handled separately. */ + if (flags == MFWaveFormatExConvertFlag_ForceExtensible) + { + format_ext = CoTaskMemAlloc(sizeof(*format_ext)); + *size = sizeof(*format_ext); + format = (WAVEFORMATEX *)format_ext; + } + else + { + format = CoTaskMemAlloc(sizeof(*format)); + *size = sizeof(*format); + } + + if (!format) + return E_OUTOFMEMORY; + + memset(format, 0, *size); + + format->wFormatTag = format_ext ? WAVE_FORMAT_EXTENSIBLE : WAVE_FORMAT_PCM; + + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value))) + format->nChannels = value; + IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &format->nSamplesPerSec); + IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &format->nAvgBytesPerSec); + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &value))) + format->nBlockAlign = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value))) + format->wBitsPerSample = value; + if (format_ext) + { + format->cbSize = sizeof(*format_ext) - sizeof(*format); + + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &value))) + format_ext->Samples.wSamplesPerBlock = value; + + IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &format_ext->dwChannelMask); + memcpy(&format_ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(format_ext->SubFormat)); + } + + *ret_format = format; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1d4035c..7823ac0 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -74,7 +74,7 @@ @ stub MFCreateVideoMediaTypeFromSubtype @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader -@ stub MFCreateWaveFormatExFromMFMediaType +@ stdcall MFCreateWaveFormatExFromMFMediaType(ptr ptr ptr long) @ stub MFDeserializeAttributesFromStream @ stub MFDeserializeEvent @ stub MFDeserializeMediaTypeFromStream diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f62136f..f081d97 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2744,6 +2744,72 @@ static void test_wrapped_media_type(void) IMFMediaType_Release(mediatype2); } +static void test_MFCreateWaveFormatExFromMFMediaType(void) +{ + WAVEFORMATEXTENSIBLE *format_ext; + IMFMediaType *mediatype; + WAVEFORMATEX *format; + UINT32 size; + HRESULT hr; + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + /* Audio/PCM */ + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(format != NULL, "Expected format structure.\n"); + ok(size == sizeof(*format), "Unexpected size %u.\n", size); + ok(format->wFormatTag == WAVE_FORMAT_PCM, "Unexpected tag.\n"); + ok(format->nChannels == 0, "Unexpected number of channels, %u.\n", format->nChannels); + ok(format->nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format->nSamplesPerSec); + ok(format->nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", format->nAvgBytesPerSec); + ok(format->nBlockAlign == 0, "Unexpected alignment, %u.\n", format->nBlockAlign); + ok(format->wBitsPerSample == 0, "Unexpected sample size, %u.\n", format->wBitsPerSample); + ok(format->cbSize == 0, "Unexpected size field, %u.\n", format->cbSize); + CoTaskMemFree(format); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format_ext, &size, + MFWaveFormatExConvertFlag_ForceExtensible); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(format_ext != NULL, "Expected format structure.\n"); + ok(size == sizeof(*format_ext), "Unexpected size %u.\n", size); + ok(format_ext->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Unexpected tag.\n"); + ok(format_ext->Format.nChannels == 0, "Unexpected number of channels, %u.\n", format_ext->Format.nChannels); + ok(format_ext->Format.nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format_ext->Format.nSamplesPerSec); + ok(format_ext->Format.nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", + format_ext->Format.nAvgBytesPerSec); + ok(format_ext->Format.nBlockAlign == 0, "Unexpected alignment, %u.\n", format_ext->Format.nBlockAlign); + ok(format_ext->Format.wBitsPerSample == 0, "Unexpected sample size, %u.\n", format_ext->Format.wBitsPerSample); + ok(format_ext->Format.cbSize == sizeof(*format_ext) - sizeof(format_ext->Format), "Unexpected size field, %u.\n", + format_ext->Format.cbSize); + CoTaskMemFree(format_ext); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_ForceExtensible + 1); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(size == sizeof(*format), "Unexpected size %u.\n", size); + CoTaskMemFree(format); + + IMFMediaType_Release(mediatype); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -2777,6 +2843,7 @@ START_TEST(mfplat) test_MFCompareFullToPartialMediaType(); test_attributes_serialization(); test_wrapped_media_type(); + test_MFCreateWaveFormatExFromMFMediaType(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 775a89f..cee9d40 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -344,6 +344,12 @@ typedef void (CALLBACK *MFPERIODICCALLBACK)(IUnknown *context); #define MF_4096_BYTE_ALIGNMENT 0x00000fff #define MF_8192_BYTE_ALIGNMENT 0x00001fff +typedef enum _MFWaveFormatExConvertFlags +{ + MFWaveFormatExConvertFlag_Normal = 0, + MFWaveFormatExConvertFlag_ForceExtensible = 1, +} MFWaveFormatExConvertFlags; + HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); @@ -363,6 +369,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); +HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size);

1 0

Alexandre Julliard : crtdll: Sort source file list.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: e70d4c387b7851a54bf22ba1f4303652936ce084 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e70d4c387b7851a54bf22ba1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 21:53:53 2019 +0200 crtdll: Sort source file list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/Makefile.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index 71c62b1..ac07045 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -4,31 +4,31 @@ PARENTSRC = ../msvcrt DELAYIMPORTS = advapi32 user32 C_SRCS = \ - cpp.c \ console.c \ + cpp.c \ ctype.c \ data.c \ dir.c \ environ.c \ - locale.c \ errno.c \ - exit.c \ except.c \ except_arm.c \ except_arm64.c \ except_i386.c \ except_x86_64.c \ - lock.c \ + exit.c \ file.c \ heap.c \ + locale.c \ + lock.c \ + main.c \ math.c \ mbcs.c \ misc.c \ process.c \ - main.c \ - string.c \ scanf.c \ + string.c \ + thread.c \ time.c \ undname.c \ - thread.c \ wcs.c

1 0

Alexandre Julliard : taskmgr: Use C runtime wchar functions instead of wine/unicode.h.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 3036649a34d46a68a3655684d7069c9755bc439d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3036649a34d46a68a3655684… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 11:50:11 2019 +0200 taskmgr: Use C runtime wchar functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/affinity.c | 1 - programs/taskmgr/applpage.c | 11 +++-- programs/taskmgr/column.c | 101 ++++++++++++++++++++++---------------------- programs/taskmgr/debug.c | 1 - programs/taskmgr/endproc.c | 1 - programs/taskmgr/graph.c | 11 +++-- programs/taskmgr/perfpage.c | 1 - programs/taskmgr/priority.c | 1 - programs/taskmgr/taskmgr.c | 5 +-- programs/taskmgr/trayicon.c | 1 - 10 files changed, 62 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3036649a34d46a68a365…

1 0

Alexandre Julliard : regedit: Use C runtime wchar functions instead of wine/unicode.h.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 0b18409cfc089a20a4b7868b84c174baa8f7ef29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b18409cfc089a20a4b7868b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 11:47:50 2019 +0200 regedit: Use C runtime wchar functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 3 +-- programs/regedit/edit.c | 5 ++--- programs/regedit/framewnd.c | 5 ++--- programs/regedit/hexedit.c | 3 +-- programs/regedit/listview.c | 1 - programs/regedit/regedit.c | 5 ++--- programs/regedit/regproc.c | 53 ++++++++++++++++++++++----------------------- 7 files changed, 34 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b18409cfc089a20a4b7…

1 0

Alexandre Julliard : notepad: Use C runtime wchar functions instead of wine/unicode.h.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: ad21554ecd8d7a41e95f5feeee2a1aa36ada252e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad21554ecd8d7a41e95f5fee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 11:42:31 2019 +0200 notepad: Use C runtime wchar functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index da39eec..37ee7ec 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -31,7 +31,6 @@ #include "main.h" #include "dialog.h" #include "notepad_res.h" -#include "wine/unicode.h" NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; @@ -684,7 +683,7 @@ static void HandleCommandLine(LPWSTR cmdline) static const WCHAR txtW[] = { '.','t','x','t',0 }; /* try to find file with ".txt" extension */ - if (strchrW(PathFindFileNameW(cmdline), '.')) + if (wcschr(PathFindFileNameW(cmdline), '.')) { file_exists = FALSE; file_name = cmdline;

1 0

Zebediah Figura : quartz/tests: Add some tests for IBaseFilter_FindPin() on the video renderer.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 70803a4d228d128d05c7071bb9671d4126a95840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70803a4d228d128d05c7071b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 20:28:03 2019 -0500 quartz/tests: Add some tests for IBaseFilter_FindPin() on the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c4e64ec..7315d8d 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -22,6 +22,8 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'I','n',0}; + static IBaseFilter *create_video_renderer(void) { IBaseFilter *filter = NULL; @@ -176,6 +178,35 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + IBaseFilter *filter = create_video_renderer(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); + IPin_Release(pin); + IPin_Release(pin2); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -238,6 +269,7 @@ START_TEST(videorenderer) test_interfaces(); test_enum_pins(); + test_find_pin(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Clean up tests for video renderer filter interfaces.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: d8f54a710453ec643114629a38745c2abbbc54b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8f54a710453ec643114629a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 20:28:01 2019 -0500 quartz/tests: Clean up tests for video renderer filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 115 +++++++++++++++----------------------- 1 file changed, 46 insertions(+), 69 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 35e6f10..e487e65 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -19,71 +19,60 @@ */ #define COBJMACROS - -#include "wine/test.h" #include "dshow.h" +#include "wine/test.h" -#define QI_SUCCEED(iface, riid, ppv) hr = IUnknown_QueryInterface(iface, &riid, (LPVOID*)&ppv); \ - ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); \ - ok(ppv != NULL, "Pointer is NULL\n"); - -#define RELEASE_EXPECT(iface, num) if (iface) { \ - hr = IUnknown_Release((IUnknown*)iface); \ - ok(hr == num, "IUnknown_Release should return %d, got %d\n", num, hr); \ -} - -static IUnknown *pVideoRenderer = NULL; - -static int create_video_renderer(void) +static IBaseFilter *create_video_renderer(void) { - HRESULT hr; - - hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (LPVOID*)&pVideoRenderer); - return (hr == S_OK && pVideoRenderer != NULL); + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; } -static void release_video_renderer(void) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { - HRESULT hr; + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; - hr = IUnknown_Release(pVideoRenderer); - ok(hr == 0, "IUnknown_Release failed with %x\n", hr); + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); } -static void test_query_interface(void) +static void test_interfaces(void) { - HRESULT hr; - IBaseFilter *pBaseFilter = NULL; - IBasicVideo *pBasicVideo = NULL; - IDirectDrawVideo *pDirectDrawVideo = NULL; - IKsPropertySet *pKsPropertySet = NULL; - IMediaPosition *pMediaPosition = NULL; - IMediaSeeking *pMediaSeeking = NULL; - IQualityControl *pQualityControl = NULL; - IQualProp *pQualProp = NULL; - IVideoWindow *pVideoWindow = NULL; - - QI_SUCCEED(pVideoRenderer, IID_IBaseFilter, pBaseFilter); - RELEASE_EXPECT(pBaseFilter, 1); - QI_SUCCEED(pVideoRenderer, IID_IBasicVideo, pBasicVideo); - RELEASE_EXPECT(pBasicVideo, 1); - QI_SUCCEED(pVideoRenderer, IID_IMediaSeeking, pMediaSeeking); - RELEASE_EXPECT(pMediaSeeking, 1); - QI_SUCCEED(pVideoRenderer, IID_IQualityControl, pQualityControl); - RELEASE_EXPECT(pQualityControl, 1); - todo_wine { - QI_SUCCEED(pVideoRenderer, IID_IDirectDrawVideo, pDirectDrawVideo); - RELEASE_EXPECT(pDirectDrawVideo, 1); - QI_SUCCEED(pVideoRenderer, IID_IKsPropertySet, pKsPropertySet); - RELEASE_EXPECT(pKsPropertySet, 1); - QI_SUCCEED(pVideoRenderer, IID_IQualProp, pQualProp); - RELEASE_EXPECT(pQualProp, 1); - } - QI_SUCCEED(pVideoRenderer, IID_IMediaPosition, pMediaPosition); - RELEASE_EXPECT(pMediaPosition, 1); - QI_SUCCEED(pVideoRenderer, IID_IVideoWindow, pVideoWindow); - RELEASE_EXPECT(pVideoWindow, 1); + IBaseFilter *filter = create_video_renderer(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + todo_wine check_interface(filter, &IID_IDirectDrawVideo, TRUE); + todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IQualityControl, TRUE); + todo_wine check_interface(filter, &IID_IQualProp, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IDispatch, FALSE); + check_interface(filter, &IID_IOverlay, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + + IBaseFilter_Release(filter); } static void test_pin(IPin *pin) @@ -105,19 +94,11 @@ static void test_pin(IPin *pin) static void test_basefilter(void) { IEnumPins *pin_enum = NULL; - IBaseFilter *base = NULL; + IBaseFilter *base = create_video_renderer(); IPin *pins[2]; ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pVideoRenderer, &IID_IBaseFilter, (void **)&base); - if (base == NULL) - { - /* test_query_interface handles this case */ - skip("No IBaseFilter\n"); - return; - } - hr = IBaseFilter_EnumPins(base, NULL); ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); @@ -153,13 +134,9 @@ static void test_basefilter(void) START_TEST(videorenderer) { CoInitialize(NULL); - if (!create_video_renderer()) - return; - test_query_interface(); + test_interfaces(); test_basefilter(); - release_video_renderer(); - CoUninitialize(); }

1 0

Alexandre Julliard : reg: Use C runtime wchar functions instead of wine/ unicode.h.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 518a6c2d072f124abe230492bfc8658d237ad55c URL: https://source.winehq.org/git/wine.git/?a=commit;h=518a6c2d072f124abe230492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 11:44:50 2019 +0200 reg: Use C runtime wchar functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 18 +++++++++--------- programs/reg/import.c | 35 +++++++++++++++++------------------ programs/reg/reg.c | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 50 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=518a6c2d072f124abe23…

1 0

Zebediah Figura : quartz/tests: Add some tests for video renderer pin interfaces.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 8ec29106b3d31efc936a2603d1ecffb8220cd6db URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec29106b3d31efc936a2603… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 20:28:05 2019 -0500 quartz/tests: Add some tests for video renderer pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 3d3d939..c7f0df4 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -58,6 +58,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_video_renderer(); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IBasicVideo, TRUE); @@ -81,6 +82,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IPin, FALSE); check_interface(filter, &IID_IReferenceClock, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IPinConnection, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); IBaseFilter_Release(filter); }

1 0

Zebediah Figura : quartz/tests: Add some tests for querying video renderer pin information.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: d1ce610e8113237c96b05320c63b4487114f439a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1ce610e8113237c96b05320… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 20:28:04 2019 -0500 quartz/tests: Add some tests for querying video renderer pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 48 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 7315d8d..3d3d939 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -207,6 +207,53 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + static const WCHAR sink_name[] = {'I','n','p','u','t',0}; + IBaseFilter *filter = create_video_renderer(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); +todo_wine + ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -270,6 +317,7 @@ START_TEST(videorenderer) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : setupapi: Also check devices not in the set when using DICD_GENERATE_ID.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 54800316531275678ee9711f889350a68d98f19b URL: https://source.winehq.org/git/wine.git/?a=commit;h=54800316531275678ee9711f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 21:22:11 2019 -0500 setupapi: Also check devices not in the set when using DICD_GENERATE_ID. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ab7eeeb..45f4df7 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1513,6 +1513,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const HKEY enum_hkey; HKEY instance_hkey; struct device *device; + LONG l; TRACE("devinfo %p, name %s, class %s, description %s, hwnd %p, flags %#x, device_data %p.\n", devinfo, debugstr_w(name), debugstr_guid(class), debugstr_w(description), @@ -1540,8 +1541,8 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const } if ((flags & DICD_GENERATE_ID)) { - static const WCHAR formatW[] = {'R','O','O','T','\\','%','s','\\','%','0','4','d',0}; - int instance_id, highest_id = -1; + static const WCHAR formatW[] = {'R','O','O','T','\\','%','s','\\','%','0','4','u',0}; + unsigned int instance_id; if (strchrW(name, '\\')) { @@ -1549,25 +1550,20 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const return FALSE; } - LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) + for (instance_id = 0; ; ++instance_id) { - const WCHAR *instance_str = strrchrW(device->instanceId, '\\'); - WCHAR *endptr; - - if (instance_str) - instance_str++; - else - instance_str = device->instanceId; - - instance_id = strtoulW(instance_str, &endptr, 10); - if (*instance_str && !*endptr) - highest_id = max(highest_id, instance_id); - } + if (snprintfW(id, ARRAY_SIZE(id), formatW, name, instance_id) == -1) + { + SetLastError(ERROR_INVALID_DEVINST_NAME); + return FALSE; + } - if (snprintfW(id, ARRAY_SIZE(id), formatW, name, highest_id + 1) == -1) - { - SetLastError(ERROR_INVALID_DEVINST_NAME); - return FALSE; + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL, &enum_hkey, NULL); + if (!(l = RegOpenKeyExW(enum_hkey, id, 0, KEY_READ, &instance_hkey))) + RegCloseKey(instance_hkey); + if (l == ERROR_FILE_NOT_FOUND) + break; + RegCloseKey(enum_hkey); } } else

1 0

Zebediah Figura : quartz/tests: Add some tests for IBaseFilter_EnumPins() on the video renderer.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 146c188477166869fd30438856cf1865d5334019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=146c188477166869fd304388… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 20:28:02 2019 -0500 quartz/tests: Add some tests for IBaseFilter_EnumPins() on the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 102 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index e487e65..c4e64ec 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -31,6 +31,13 @@ static IBaseFilter *create_video_renderer(void) return filter; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -75,6 +82,100 @@ static void test_interfaces(void) IBaseFilter_Release(filter); } + +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_video_renderer(); + IEnumPins *enum1, *enum2; + IPin *pins[2]; + ULONG count; + HRESULT hr; + ULONG ref; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -136,6 +237,7 @@ START_TEST(videorenderer) CoInitialize(NULL); test_interfaces(); + test_enum_pins(); test_basefilter(); CoUninitialize();

1 0

Francois Gouget : testbot/RestoreVM: A script to restore a Libirt/QEmu VM.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: tools Branch: master Commit: c83123416c0f3e9d103bf9c3757c6b9a62e9479e URL: https://source.winehq.org/git/tools.git/?a=commit;h=c83123416c0f3e9d103bf9c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 1 03:44:12 2019 +0200 testbot/RestoreVM: A script to restore a Libirt/QEmu VM. This allows restoring a VM from either a borg repository (potentially remote), a set of compressed tar files or a directory created by the --extract-only option. RestoreVM automatically waits for the VM to not be in use before restoring it, and minimises the time it takes to perform the final step. RestoreVM --disk-only verifies that none of the Libvirt configuration files changed and then only replaces the disks. This can be useful to remove accumulated cruft from the qcow2 image files. The VM can be renamed during restoration, in which case its uuid and MAC address are also modified to avoid conflicts (but the guest configuration such as hostname and IP address must be changed manually). With --extract-only RestoreVM will just extract the files to a temporary directory and show the commands to use to manually put them into place. The --extract-only option can be combined with renaming the VM and the directory will contain both sets of Libvirt configuration files which allows comparing and verifying them. In case of an error (such as if the VM is running and does not stop within the imparted time) RestoreVM automatically switches to the --extract-only mode. This allows continuing the restoration by passing that directory as an argument once the issue has been resolved. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/RestoreVM | 711 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 711 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=c83123416c0f3e9d103…

1 0

Francois Gouget : testbot/BackupVM: A script for backing up a Libvirt/ QEmu VM.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: tools Branch: master Commit: 4061512746c8829a5eaaf62c85e604906704714f URL: https://source.winehq.org/git/tools.git/?a=commit;h=4061512746c8829a5eaaf62… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 1 03:43:53 2019 +0200 testbot/BackupVM: A script for backing up a Libvirt/QEmu VM. The script supports backing up to either a borg repository, possibly remote, the deduplication makes this ideal for backups; or tar files, which is more suited for archival. By default the script will refuse to perform the backup if it foundi no snapshots. If that's expected pass the --no-snapshot option. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/BackupVM | 362 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 362 insertions(+) diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM new file mode 100755 index 0000000..2cf3320 --- /dev/null +++ b/testbot/scripts/BackupVM @@ -0,0 +1,362 @@ +#!/bin/sh +# +# Creates a backup of a QEMU/LibVirt VM. +# +# Copyright 2013-2019 Francois Gouget +# +# 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 + +name0=`basename "$0"` + +etcdir="etc/libvirt/qemu" +snapdir="var/lib/libvirt/qemu/snapshot" + + +# +# Generic helpers +# + +error() +{ + echo "$name0:error:" "$@" >&2 +} + +warning() +{ + echo "$name0:warning:" "$@" >&2 +} + +opt_dry_run="" +opt_verbose="" +dry_run() +{ + [ -n "$opt_verbose$opt_dry_run" ] && echo "$@" + if [ -z "$opt_dry_run" ] + then + "$@" + fi +} + + +# +# Process the command line +# + +check_opt_val() +{ + option="$1" + var="$2" + argc="$3" + + if [ -n "$var" ] + then + error "$option can only be specified once" + usage=2 # but continue processing options + fi + if [ $argc -eq 0 ] + then + error "missing value for $option" + usage=2 + return 1 + fi + return 0 +} + +opt_vm="" +opt_suffix="" +opt_snapshot="1" +opt_borg="" +opt_connect="" +usage="" +while [ $# -gt 0 ] +do + arg="$1" + shift + case "$arg" in + --borg) + if check_opt_val "$arg" "$opt_borg" $# + then + opt_borg="$1" + shift + fi + ;; + --snapshot) + opt_snapshot="1" + ;; + --no-snapshot) + opt_snapshot="" + ;; + --connect) + if check_opt_val "$arg" "$opt_connect" $# + then + opt_connect="$1" + shift + fi + ;; + --verbose) + opt_verbose="1" + ;; + --dry-run) + opt_dry_run="1" + ;; + -\?|-h|--help) + usage=0 + ;; + -*) + error "unknown option '$arg'" + usage=2 + break + ;; + *) + if [ -z "$opt_vm" ] + then + opt_vm="$arg" + elif [ -z "$opt_suffix" ] + then + opt_suffix="$arg" + else + error "only one VM and suffix can be specified." + usage=2 + fi + ;; + esac +done + +if [ -z "$usage" ] +then + if [ -z "$opt_vm" ] + then + error "you must specify the name of the VM to backup." + usage=2 + fi + [ -n "$opt_connect" ] || opt_connect="qemu:///system" +fi + +if [ -n "$usage" ] +then + if [ "$usage" != "0" ] + then + error "try '$name0 --help' for more information" + exit $usage + fi + cat <<EOF +Usage: $name0 [--no-snapshot] [--verbose] [--dry-run] [--help] [--borg REPO] + [--connect URI] VMNAME [SUFFIX] + +Creates a backup of the specified VM. +This must be run as root on the VM host. + +Where: + VMNAME The name of the VM to backup. + SUFFIX A (short) string to add to the backup name. This can help + provide an indication of what features were added to this + backup. + --borg REPO The borg repository to backup to. + --no-snapshot It is ok for the VM to have no snapshot. + --connect URI Connect to the specified Libvirt server. + --verbose Show all the commands as they are being run. + --dry-run Show what would happen but do not extract or change anything. + --help, -h Shows this help message. +EOF + exit 0 +fi + + +# +# Prepare the backup +# + +get_vm_disk_images() +{ + _root="$1" + _vm="$2" + sed -e "s~^ *<source file='$[^']*$' */> *\$~\\1~" -e t -e d "$_root$etcdir/$_vm.xml" "$_root$snapdir/$_vm"/*.xml | sort | uniq +} + +get_symlink_closure() +{ + while read file + do + echo "$file" + while [ -h "$file" ] + do + target=`readlink "$file"` + case "$target" in + /*) file="$target" ;; + *) file=`dirname "$file"`"/$target" ;; + esac + echo "$file" + done + done +} + +if [ ! -r "/$etcdir/$opt_vm.xml" ] +then + error "the '/$etcdir/$opt_vm.xml' configuration file is not readable" + exit 2 +fi + +snapshots=`echo "/$snapdir/$opt_vm"/*.xml` +if [ -n "$opt_snapshot" -a "$snapshots" = "/$snapdir/$opt_vm/*.xml" ] +then + error "the '$opt_vm' VM does not seem to have snapshots! Use --no-snapshot if this is expected." + exit 2 +fi + +# Backup the symbolic links but also their targets! +disks=`get_vm_disk_images "/" "$opt_vm" 2>/dev/null | get_symlink_closure | sort | uniq` +if [ -z "$disks" ] +then + error "could not find the disk images." + exit 2 +fi + +confs=`for file in "/$etcdir/$opt_vm.xml" $snapshots; do echo $file; done | get_symlink_closure` + +errors="" +all_paths="" +echo "$opt_vm uses the following files and directories:" +for file in $confs $disks +do + all_paths="$all_paths $file" + echo " $file" + if [ ! -r "$file" ] + then + error "'$file' is not readable." + errors=1 + fi +done +[ -z "$errors" ] || exit 1 +echo + + +# +# Wait for the VM +# + +fatal() +{ + error "$@" + exit 1 +} + +wait_for_vm() +{ + _vm="$1" + _timeout="$2" + + while true + do + _state=`(virsh --connect "$opt_connect" list --all 2>/dev/null || echo " $_vm error") | sed -e "s/^.* $_vm *//" -e t -e d` + [ -z "$opt_dry_run" ] || _state="shut off" + case "$_state" in + "error") + echo "nolibvirt" + return + ;; + "") + echo "novm" + return + ;; + "shut off") + echo "off" + return + ;; + esac + + echo "$_vm is not powered off ($_state). Waiting for up to ${_timeout}s..." >&2 + _timeout=`expr $_timeout - 10` + if [ $_timeout -le 0 ] + then + echo "running" + return + fi + sleep 10 + done +} + +# Note that we don't actually care whether libvirt knows about the VM since +# we know which files to backup anyway. +case `wait_for_vm "$opt_vm" 120` in +nolibvirt) + warning "Could not connect to libvirt. Assuming $opt_vm is not running." + ;; +running) + fatal "$opt_vm is running. Try again when it has been powered off." + ;; +esac + + +# +# Do the backup +# + +nice="" +which ionice >/dev/null && nice="ionice" +which nice >/dev/null && nice="nice $nice" + +backup="libvirt-$opt_vm-`date +%Y%m%d`" +[ -n "$opt_suffix" ] && backup="$backup-$opt_suffix" + +if [ -n "$opt_borg" ] +then + borg_opts="" + [ -n "$opt_verbose" ] && borg_opts="$borg_opts --verbose" + dry_run $nice borg create --progress --stats -C lzma,9 \ + "$opt_borg::$backup" $all_paths + rc_borg=$? + if [ $rc_borg -ne 0 ] + then + fatal "an error occurred while saving the VM (borg=$rc_borg)" + fi + echo "Saved $opt_vm to '$opt_borg::$backup'" + +else + zipcmd=pbzip2 + which pbzip2 >/dev/null || zipcmd=bzip2 + + tar_opts="" + [ -n "$opt_verbose" ] && tar_opts="-v" + if [ -n "$opt_verbose$opt_dry_run" ] + then + echo "$nice tar cf - $tar_opts $all_paths | $nice $zipcmd -9 | $nice split -d -b 2146435072 - '$backup.tar.bz2.'" + fi + + if [ -n "$opt_dry_run" ] + then + rc_tar=0 + rc_zip=0 + rc_split=0 + else + ($nice tar cf - $tar_opts $all_paths; echo $? >"rc_tar" ) | \ + ($nice $zipcmd -9; echo $? >"rc_zip") | \ + $nice split -d -b 2146435072 - "$backup.tar.bz2." + rc_split=$? + rc_zip=`cat "rc_zip"` + rc_tar=`cat "rc_tar"` + rm -f "rc_tar" "rc_zip" + fi + if [ "$rc_tar" != "0" -o "$rc_zip" != "0" -o "$rc_split" != "0" ] + then + fatal "an error occurred while saving the VM (tar=$rc_tar zip=$rc_zip split=$rc_split)" + fi + echo "Saved $opt_vm to '$backup.tar.bz2.*'" +fi + +case `wait_for_vm "$opt_vm" 0` in +running) + fatal "$opt_vm is running. The backup may be bad." + ;; +esac

1 0

Francois Gouget : testbot: Document the Net::OpenSSH dependency.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: tools Branch: master Commit: a6338685571a035b291bf4ed8d9997402b65681a URL: https://source.winehq.org/git/tools.git/?a=commit;h=a6338685571a035b291bf4e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 1 03:43:17 2019 +0200 testbot: Document the Net::OpenSSH dependency. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index bae1e82..456ffe6 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -9,7 +9,7 @@ Dependencies: - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) -- Optional: Net::SSH2 (for SSH tunneling, libnet-ssh2-perl) +- Optional: Net::OpenSSH (for SSH tunneling, libnet-openssh-perl) MySQL setup: - Create a new 'winetestbot' database and its tables using the

1 0

Józef Kucia : vkd3d-shader: Fix SV_Position.w in pixel shaders.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: vkd3d Branch: master Commit: acc9430abe5ab5997acc5c0a7d6a6452b80ccc9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=acc9430abe5ab5997acc5c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 1 11:19:44 2019 +0200 vkd3d-shader: Fix SV_Position.w in pixel shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f8ba598..6cacf7c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1158,6 +1158,12 @@ static uint32_t vkd3d_spirv_build_op_composite_insert(struct vkd3d_spirv_builder result_type, object_id, composite_id, indexes, index_count); } +static uint32_t vkd3d_spirv_build_op_composite_insert1(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t object_id, uint32_t composite_id, uint32_t index) +{ + return vkd3d_spirv_build_op_composite_insert(builder, result_type, object_id, composite_id, &index, 1); +} + static uint32_t vkd3d_spirv_build_op_load(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t pointer_id, uint32_t memory_access) { @@ -3215,6 +3221,21 @@ static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler, return vkd3d_dxbc_compiler_emit_bool_to_int(compiler, 1, front_facing_id); } +/* frag_coord.w = 1.0f / frag_coord.w */ +static uint32_t frag_coord_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t frag_coord_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, w_id; + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); + w_id = vkd3d_spirv_build_op_composite_extract1(builder, type_id, frag_coord_id, 3); + w_id = vkd3d_spirv_build_op_fdiv(builder, type_id, + vkd3d_dxbc_compiler_get_constant_float(compiler, 1.0f), w_id); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + return vkd3d_spirv_build_op_composite_insert1(builder, type_id, w_id, frag_coord_id, 3); +} + struct vkd3d_spirv_builtin { enum vkd3d_component_type component_type; @@ -3273,7 +3294,7 @@ vkd3d_system_value_builtins[] = }; static const struct vkd3d_spirv_builtin vkd3d_pixel_shader_position_builtin = { - VKD3D_TYPE_FLOAT, 4, SpvBuiltInFragCoord, + VKD3D_TYPE_FLOAT, 4, SpvBuiltInFragCoord, frag_coord_fixup, }; static const struct { @@ -6906,8 +6927,8 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); /* XXX: Nvidia is broken and expects that the D_ref is packed together with coordinates. */ type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - coordinate_id = vkd3d_spirv_build_op_composite_insert(builder, - type_id, dref_id, coordinate_id, &image.resource_type_info->coordinate_component_count, 1); + coordinate_id = vkd3d_spirv_build_op_composite_insert1(builder, + type_id, dref_id, coordinate_id, image.resource_type_info->coordinate_component_count); val_id = vkd3d_spirv_build_op_image_sample_dref(builder, op, sampled_type_id, image.sampled_image_id, coordinate_id, dref_id, operands_mask, image_operands, image_operand_count);

1 0

Józef Kucia : vkd3d: Add helpers for getting root signature parameters.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: vkd3d Branch: master Commit: 4408816e24a07a58e4eb3f4ee36930f16b3e0258 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4408816e24a07a58e4eb3f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 1 11:19:49 2019 +0200 vkd3d: Add helpers for getting root signature parameters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8868a72..936e965 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -334,6 +334,39 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, return S_OK; } +static const struct d3d12_root_parameter *root_signature_get_parameter( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + assert(index < root_signature->parameter_count); + return &root_signature->parameters[index]; +} + +static const struct d3d12_root_descriptor_table *root_signature_get_descriptor_table( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index); + assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE); + return &p->u.descriptor_table; +} + +static const struct d3d12_root_constant *root_signature_get_32bit_constants( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index); + assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS); + return &p->u.constant; +} + +static const struct d3d12_root_parameter *root_signature_get_root_descriptor( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index); + assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV + || p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV + || p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV); + return p; +} + /* ID3D12Fence */ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) { @@ -2037,8 +2070,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list unsigned int i, j, descriptor_count; struct d3d12_desc *descriptor; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE); - descriptor_table = &root_signature->parameters[index].u.descriptor_table; + descriptor_table = root_signature_get_descriptor_table(root_signature, index); descriptor_count = 0; for (i = 0; i < descriptor_table->range_count; ++i) @@ -2120,7 +2152,7 @@ static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *v vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; break; default: - ERR("Invalid root descriptor.\n"); + ERR("Invalid root descriptor %#x.\n", root_parameter->parameter_type); return false; } @@ -2172,7 +2204,7 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list if (!(bindings->push_descriptor_dirty_mask & (1u << i))) continue; - root_parameter = &root_signature->parameters[i]; + root_parameter = root_signature_get_root_descriptor(root_signature, i); push_descriptor = &bindings->push_descriptors[i]; if (root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV) @@ -3385,7 +3417,7 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE); + assert(root_signature_get_descriptor_table(root_signature, index)); assert(index < ARRAY_SIZE(bindings->descriptor_tables)); bindings->descriptor_tables[index] = base_descriptor; @@ -3425,8 +3457,7 @@ static void d3d12_command_list_set_root_constants(struct d3d12_command_list *lis const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct d3d12_root_constant *c; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS); - c = &root_signature->parameters[index].u.constant; + c = root_signature_get_32bit_constants(root_signature, index); VK_CALL(vkCmdPushConstants(list->vk_command_buffer, root_signature->vk_pipeline_layout, c->stage_flags, c->offset + offset * sizeof(uint32_t), count * sizeof(uint32_t), data)); } @@ -3491,7 +3522,7 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, struct VkDescriptorBufferInfo buffer_info; struct d3d12_resource *resource; - root_parameter = &root_signature->parameters[index]; + root_parameter = root_signature_get_root_descriptor(root_signature, index); assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV); resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, gpu_address); @@ -3556,9 +3587,8 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li VkDevice vk_device = list->device->vk_device; VkBufferView vk_buffer_view; - root_parameter = &root_signature->parameters[index]; - assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV - || root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV); + root_parameter = root_signature_get_root_descriptor(root_signature, index); + assert(root_parameter->parameter_type != D3D12_ROOT_PARAMETER_TYPE_CBV); /* FIXME: Re-use buffer views. */ if (!vkd3d_create_raw_buffer_view(list->device, gpu_address, &vk_buffer_view))

1 0

Józef Kucia : vkd3d: Clear descriptor dirty masks when setting root signature.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: vkd3d Branch: master Commit: 74fbfee61101901666069f1f7e868e0205266c10 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=74fbfee61101901666069f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 1 11:19:48 2019 +0200 vkd3d: Clear descriptor dirty masks when setting root signature. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d39458f..8868a72 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3351,7 +3351,9 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->root_signature = root_signature; bindings->descriptor_set = VK_NULL_HANDLE; + bindings->descriptor_table_dirty_mask = 0; bindings->descriptor_table_active_mask = 0; + bindings->push_descriptor_dirty_mask = 0; bindings->push_descriptor_active_mask = 0; }

1 0