March 2020 - Wine-commits - list.winehq.org

Jacek Caban : dbghelp: Clear N_PEXT flag of stab type in macho files.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 47f1c5a993ed34e5f1e4783360019613d0f9682a URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f1c5a993ed34e5f1e47833… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:02:03 2020 +0200 dbghelp: Clear N_PEXT flag of stab type in macho files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/stabs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 744ccfa9df..fedb1084ab 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1349,7 +1349,10 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, if (stab_ptr->n_type & N_STAB) type = stab_ptr->n_type; else + { type = (stab_ptr->n_type & N_TYPE); + if (module->type == DMT_MACHO) type &= ~N_PEXT; + } /* only symbol entries contain a typedef */ switch (type)

1 0

Alexandre Julliard : ntdll: Avoid using toupperW().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 1cde8696271e71364ba2df0aaa374c93953f6fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cde8696271e71364ba2df0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 12:05:16 2020 +0200 ntdll: Avoid using toupperW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/loadorder.c | 17 +++++++---------- dlls/ntdll/locale.c | 3 ++- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/path.c | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 993a661015..cb9ce3740e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1394,7 +1394,7 @@ static BOOLEAN match_filename( const UNICODE_STRING *name_str, const UNICODE_STR if (is_case_sensitive) while (name < name_end && (*name != *mask)) name++; else - while (name < name_end && (toupperW(*name) != toupperW(*mask))) name++; + while (name < name_end && (towupper(*name) != towupper(*mask))) name++; next_to_retry = name; break; case '?': @@ -1403,7 +1403,7 @@ static BOOLEAN match_filename( const UNICODE_STRING *name_str, const UNICODE_STR break; default: if (is_case_sensitive) mismatch = (*mask != *name); - else mismatch = (toupperW(*mask) != toupperW(*name)); + else mismatch = (towupper(*mask) != towupper(*name)); if (!mismatch) { diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 8469f487d3..8c540f9683 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -89,13 +89,12 @@ static const WCHAR *get_basename( const WCHAR *name ) * * Remove extension if it is ".dll". */ -static inline void remove_dll_ext( WCHAR *ext ) +static inline void remove_dll_ext( WCHAR *name ) { - if (ext[0] == '.' && - toupperW(ext[1]) == 'D' && - toupperW(ext[2]) == 'L' && - toupperW(ext[3]) == 'L' && - !ext[4]) ext[0] = 0; + static const WCHAR dllW[] = {'.','d','l','l',0}; + WCHAR *p = strrchrW( name, '.' ); + + if (p && !wcsicmp( p, dllW )) *p = 0; } @@ -213,8 +212,7 @@ static void add_load_order_set( WCHAR *entry ) if (*end) *end++ = 0; if (*entry) { - WCHAR *ext = strrchrW(entry, '.'); - if (ext) remove_dll_ext( ext ); + remove_dll_ext( entry ); ldo.modulename = entry; add_load_order( &ldo ); entry = end; @@ -457,10 +455,9 @@ enum loadorder get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_n if (!(len = strlenW(path))) return ret; if (!(module = RtlAllocateHeap( GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR) ))) return ret; strcpyW( module+1, path ); /* reserve module[0] for the wildcard char */ + remove_dll_ext( module + 1 ); basename = (WCHAR *)get_basename( module+1 ); - if (len >= 4) remove_dll_ext( module + 1 + len - 4 ); - /* first explicit module name */ if ((ret = get_load_order_value( std_key, app_key, module+1 )) != LO_INVALID) goto done; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 123b8985b1..915a644c9d 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1638,7 +1638,8 @@ WCHAR __cdecl NTDLL_towlower( WCHAR ch ) */ WCHAR __cdecl NTDLL_towupper( WCHAR ch ) { - return casemap( nls_info.UpperCaseTable, ch ); + if (nls_info.UpperCaseTable) return casemap( nls_info.UpperCaseTable, ch ); + return casemap_ascii( ch ); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 20feabf56b..fe0d1755d0 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -298,6 +298,7 @@ ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); #define wcsicmp(s1,s2) NTDLL__wcsicmp(s1,s2) #define wcsnicmp(s1,s2,n) NTDLL__wcsnicmp(s1,s2,n) +#define towupper(c) NTDLL_towupper(c) #define wcslwr(s) NTDLL__wcslwr(s) #define wcsupr(s) NTDLL__wcsupr(s) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 65539fa018..2f7b031d81 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -670,7 +670,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) case RELATIVE_DRIVE_PATH: /* c:foo */ dep = 2; - if (toupperW(name[0]) != toupperW(cd->Buffer[0]) || cd->Buffer[1] != ':') + if (wcsnicmp( name, cd->Buffer, 2 )) { UNICODE_STRING var, val;

1 0

Daniel Lehman : loader: Add Marquesas Standard Time Zone.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: b41d5c10ad8b063558b57ab346a61559f27485a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b41d5c10ad8b063558b57ab3… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Mar 29 20:09:11 2020 -0700 loader: Add Marquesas Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 6 ++ po/ar.po | 198 +++++++++++++++++++++++++++------------------------ po/ast.po | 198 +++++++++++++++++++++++++++------------------------ po/bg.po | 194 +++++++++++++++++++++++++------------------------ po/ca.po | 198 +++++++++++++++++++++++++++------------------------ po/cs.po | 198 +++++++++++++++++++++++++++------------------------ po/da.po | 198 +++++++++++++++++++++++++++------------------------ po/de.po | 198 +++++++++++++++++++++++++++------------------------ po/el.po | 194 +++++++++++++++++++++++++------------------------ po/en.po | 194 +++++++++++++++++++++++++------------------------ po/en_US.po | 194 +++++++++++++++++++++++++------------------------ po/eo.po | 198 +++++++++++++++++++++++++++------------------------ po/es.po | 198 +++++++++++++++++++++++++++------------------------ po/fa.po | 196 ++++++++++++++++++++++++++------------------------ po/fi.po | 198 +++++++++++++++++++++++++++------------------------ po/fr.po | 198 +++++++++++++++++++++++++++------------------------ po/he.po | 198 +++++++++++++++++++++++++++------------------------ po/hi.po | 194 +++++++++++++++++++++++++------------------------ po/hr.po | 198 +++++++++++++++++++++++++++------------------------ po/hu.po | 198 +++++++++++++++++++++++++++------------------------ po/it.po | 198 +++++++++++++++++++++++++++------------------------ po/ja.po | 198 +++++++++++++++++++++++++++------------------------ po/ko.po | 198 +++++++++++++++++++++++++++------------------------ po/lt.po | 198 +++++++++++++++++++++++++++------------------------ po/ml.po | 194 +++++++++++++++++++++++++------------------------ po/nb_NO.po | 198 +++++++++++++++++++++++++++------------------------ po/nl.po | 198 +++++++++++++++++++++++++++------------------------ po/or.po | 194 +++++++++++++++++++++++++------------------------ po/pa.po | 194 +++++++++++++++++++++++++------------------------ po/pl.po | 198 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 198 +++++++++++++++++++++++++++------------------------ po/pt_PT.po | 198 +++++++++++++++++++++++++++------------------------ po/rm.po | 194 +++++++++++++++++++++++++------------------------ po/ro.po | 198 +++++++++++++++++++++++++++------------------------ po/ru.po | 194 +++++++++++++++++++++++++------------------------ po/si.po | 198 +++++++++++++++++++++++++++------------------------ po/sk.po | 198 +++++++++++++++++++++++++++------------------------ po/sl.po | 198 +++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 197 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 197 ++++++++++++++++++++++++++------------------------ po/sv.po | 198 +++++++++++++++++++++++++++------------------------ po/ta.po | 194 +++++++++++++++++++++++++------------------------ po/te.po | 194 +++++++++++++++++++++++++------------------------ po/th.po | 196 ++++++++++++++++++++++++++------------------------ po/tr.po | 198 +++++++++++++++++++++++++++------------------------ po/uk.po | 194 +++++++++++++++++++++++++------------------------ po/wa.po | 196 ++++++++++++++++++++++++++------------------------ po/wine.pot | 194 +++++++++++++++++++++++++------------------------ po/zh_CN.po | 198 +++++++++++++++++++++++++++------------------------ po/zh_TW.po | 198 +++++++++++++++++++++++++++------------------------ 51 files changed, 5089 insertions(+), 4557 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b41d5c10ad8b063558b5…

1 0

Zebediah Figura : server: Check whether the new file name is executable.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 2b3904d2331a99666e9ce72e6d274d30c3424e82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b3904d2331a99666e9ce72e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 30 00:12:18 2020 -0500 server: Check whether the new file name is executable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index 5019ae2da0..d4584f7326 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2438,7 +2438,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, if (is_file_executable( fd->unix_name ) != is_file_executable( name ) && !fstat( fd->unix_fd, &st )) { - if (is_file_executable( fd->unix_name )) + if (is_file_executable( name )) /* set executable bit where read bit is set */ st.st_mode |= (st.st_mode & 0444) >> 2; else

1 0

Gerald Pfeifer : dbghelp: Define NT_GNU_BUILD_ID regardless of whether __ELF__ is defined.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: f7a091af4812ef692fb2b1ec835b8146668aec5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7a091af4812ef692fb2b1ec… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Mar 28 16:23:58 2020 +0100 dbghelp: Define NT_GNU_BUILD_ID regardless of whether __ELF__ is defined. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 9be6d3ebdc..d3c154b713 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -52,10 +52,11 @@ #ifndef SHT_NULL #define SHT_NULL 0 #endif +#endif + #ifndef NT_GNU_BUILD_ID #define NT_GNU_BUILD_ID 3 #endif -#endif /* structure holding information while handling an ELF image * allows one by one section mapping for memory savings

1 0

Daniel Lehman : loader: Add Chatham Islands Standard Time Zone.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 2cefb7bd855d0041aa5ba8c80fb716402b03c85e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cefb7bd855d0041aa5ba8c8… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Mar 29 20:09:09 2020 -0700 loader: Add Chatham Islands Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 11 ++ po/ar.po | 306 ++++++++++++++++++++++++++------------------------- po/ast.po | 306 ++++++++++++++++++++++++++------------------------- po/bg.po | 302 +++++++++++++++++++++++++------------------------- po/ca.po | 306 ++++++++++++++++++++++++++------------------------- po/cs.po | 306 ++++++++++++++++++++++++++------------------------- po/da.po | 306 ++++++++++++++++++++++++++------------------------- po/de.po | 306 ++++++++++++++++++++++++++------------------------- po/el.po | 302 +++++++++++++++++++++++++------------------------- po/en.po | 302 +++++++++++++++++++++++++------------------------- po/en_US.po | 302 +++++++++++++++++++++++++------------------------- po/eo.po | 306 ++++++++++++++++++++++++++------------------------- po/es.po | 306 ++++++++++++++++++++++++++------------------------- po/fa.po | 304 +++++++++++++++++++++++++------------------------- po/fi.po | 306 ++++++++++++++++++++++++++------------------------- po/fr.po | 306 ++++++++++++++++++++++++++------------------------- po/he.po | 306 ++++++++++++++++++++++++++------------------------- po/hi.po | 302 +++++++++++++++++++++++++------------------------- po/hr.po | 306 ++++++++++++++++++++++++++------------------------- po/hu.po | 306 ++++++++++++++++++++++++++------------------------- po/it.po | 306 ++++++++++++++++++++++++++------------------------- po/ja.po | 306 ++++++++++++++++++++++++++------------------------- po/ko.po | 306 ++++++++++++++++++++++++++------------------------- po/lt.po | 306 ++++++++++++++++++++++++++------------------------- po/ml.po | 302 +++++++++++++++++++++++++------------------------- po/nb_NO.po | 306 ++++++++++++++++++++++++++------------------------- po/nl.po | 306 ++++++++++++++++++++++++++------------------------- po/or.po | 302 +++++++++++++++++++++++++------------------------- po/pa.po | 302 +++++++++++++++++++++++++------------------------- po/pl.po | 306 ++++++++++++++++++++++++++------------------------- po/pt_BR.po | 306 ++++++++++++++++++++++++++------------------------- po/pt_PT.po | 306 ++++++++++++++++++++++++++------------------------- po/rm.po | 302 +++++++++++++++++++++++++------------------------- po/ro.po | 306 ++++++++++++++++++++++++++------------------------- po/ru.po | 302 +++++++++++++++++++++++++------------------------- po/si.po | 306 ++++++++++++++++++++++++++------------------------- po/sk.po | 306 ++++++++++++++++++++++++++------------------------- po/sl.po | 306 ++++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 304 +++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 304 +++++++++++++++++++++++++------------------------- po/sv.po | 306 ++++++++++++++++++++++++++------------------------- po/ta.po | 302 +++++++++++++++++++++++++------------------------- po/te.po | 302 +++++++++++++++++++++++++------------------------- po/th.po | 304 +++++++++++++++++++++++++------------------------- po/tr.po | 306 ++++++++++++++++++++++++++------------------------- po/uk.po | 302 +++++++++++++++++++++++++------------------------- po/wa.po | 304 +++++++++++++++++++++++++------------------------- po/wine.pot | 302 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 306 ++++++++++++++++++++++++++------------------------- po/zh_TW.po | 306 ++++++++++++++++++++++++++------------------------- 51 files changed, 7738 insertions(+), 7203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2cefb7bd855d0041aa5b…

1 0

Daniel Lehman : loader: Add Bougainville Standard Time Zone.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: a1ca4fe3901569f658efb03942718b4aa9424ed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1ca4fe3901569f658efb039… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Mar 29 20:09:10 2020 -0700 loader: Add Bougainville Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 11 ++ po/ar.po | 358 ++++++++++++++++++++++++++------------------------- po/ast.po | 358 ++++++++++++++++++++++++++------------------------- po/bg.po | 354 +++++++++++++++++++++++++------------------------- po/ca.po | 358 ++++++++++++++++++++++++++------------------------- po/cs.po | 358 ++++++++++++++++++++++++++------------------------- po/da.po | 358 ++++++++++++++++++++++++++------------------------- po/de.po | 358 ++++++++++++++++++++++++++------------------------- po/el.po | 354 +++++++++++++++++++++++++------------------------- po/en.po | 354 +++++++++++++++++++++++++------------------------- po/en_US.po | 354 +++++++++++++++++++++++++------------------------- po/eo.po | 358 ++++++++++++++++++++++++++------------------------- po/es.po | 358 ++++++++++++++++++++++++++------------------------- po/fa.po | 356 +++++++++++++++++++++++++------------------------- po/fi.po | 358 ++++++++++++++++++++++++++------------------------- po/fr.po | 358 ++++++++++++++++++++++++++------------------------- po/he.po | 358 ++++++++++++++++++++++++++------------------------- po/hi.po | 354 +++++++++++++++++++++++++------------------------- po/hr.po | 358 ++++++++++++++++++++++++++------------------------- po/hu.po | 358 ++++++++++++++++++++++++++------------------------- po/it.po | 358 ++++++++++++++++++++++++++------------------------- po/ja.po | 358 ++++++++++++++++++++++++++------------------------- po/ko.po | 358 ++++++++++++++++++++++++++------------------------- po/lt.po | 358 ++++++++++++++++++++++++++------------------------- po/ml.po | 354 +++++++++++++++++++++++++------------------------- po/nb_NO.po | 358 ++++++++++++++++++++++++++------------------------- po/nl.po | 358 ++++++++++++++++++++++++++------------------------- po/or.po | 354 +++++++++++++++++++++++++------------------------- po/pa.po | 354 +++++++++++++++++++++++++------------------------- po/pl.po | 358 ++++++++++++++++++++++++++------------------------- po/pt_BR.po | 358 ++++++++++++++++++++++++++------------------------- po/pt_PT.po | 358 ++++++++++++++++++++++++++------------------------- po/rm.po | 354 +++++++++++++++++++++++++------------------------- po/ro.po | 358 ++++++++++++++++++++++++++------------------------- po/ru.po | 354 +++++++++++++++++++++++++------------------------- po/si.po | 358 ++++++++++++++++++++++++++------------------------- po/sk.po | 358 ++++++++++++++++++++++++++------------------------- po/sl.po | 358 ++++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 356 +++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 356 +++++++++++++++++++++++++------------------------- po/sv.po | 358 ++++++++++++++++++++++++++------------------------- po/ta.po | 354 +++++++++++++++++++++++++------------------------- po/te.po | 354 +++++++++++++++++++++++++------------------------- po/th.po | 356 +++++++++++++++++++++++++------------------------- po/tr.po | 358 ++++++++++++++++++++++++++------------------------- po/uk.po | 354 +++++++++++++++++++++++++------------------------- po/wa.po | 356 +++++++++++++++++++++++++------------------------- po/wine.pot | 354 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 358 ++++++++++++++++++++++++++------------------------- po/zh_TW.po | 358 ++++++++++++++++++++++++++------------------------- 51 files changed, 9012 insertions(+), 8477 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1ca4fe3901569f658ef…

1 0

Alexandre Julliard : Wine release 5.5
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: website Branch: master Commit: e369c8cbbf66108d75297e97638fb76691c27362 URL: https://source.winehq.org/git/website.git/?a=commit;h=e369c8cbbf66108d75297… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 22:15:50 2020 +0100 Wine release 5.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020032701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020032701.xml b/news/en/2020032701.xml new file mode 100644 index 00000000..034c6f9e --- /dev/null +++ b/news/en/2020032701.xml @@ -0,0 +1,17 @@ +<news> +<date>March 27, 2020</date> +<title>Wine 5.5 Released</title> +<body> + The Wine development release 5.5 is now available. + <a href="{$root}/announce/5.5">What's new</a> in this release: +<ul> + <li>Builtin libraries use the new UCRTBase C runtime.</li> + <li>Compatibility mode used when reporting Windows version.</li> + <li>Better support for debug information in PE files.</li> + <li>Support for linguistic case mappings.</li> + <li>More attributes supported in WebServices.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Anton Baskanov : amstream: Implement MediaStreamFilter::GetState.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: ef2249e4b64a705a2079c4148bbe89f59962cf48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2249e4b64a705a2079c414… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Mar 27 11:54:30 2020 -0500 amstream: Implement MediaStreamFilter::GetState. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 15 +++++++++++++-- dlls/amstream/tests/amstream.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 80a885de24..1cb2ca71ba 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -171,6 +171,7 @@ struct filter IFilterGraph *graph; ULONG nb_streams; IAMMediaStream **streams; + FILTER_STATE state; }; static inline struct filter *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) @@ -264,9 +265,19 @@ static HRESULT WINAPI filter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start static HRESULT WINAPI filter_GetState(IMediaStreamFilter *iface, DWORD timeout, FILTER_STATE *state) { - FIXME("iface %p, timeout %u, state %p, stub!\n", iface, timeout, state); + struct filter *filter = impl_from_IMediaStreamFilter(iface); + + TRACE("iface %p, timeout %u, state %p.\n", iface, timeout, state); + + if (!state) + return E_POINTER; + + EnterCriticalSection(&filter->cs); + + *state = filter->state; + + LeaveCriticalSection(&filter->cs); - *state = State_Stopped; return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 09686cfcf4..cfdd8b6c8d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2737,6 +2737,37 @@ static void test_audiostream_receive_connection(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +void test_mediastreamfilter_get_state(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStreamFilter *filter; + FILTER_STATE state; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!filter, "Expected non-null filter.\n"); + + /* Crashes on native. */ + if (0) + { + hr = IMediaStreamFilter_GetState(filter, 0, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + state = 0xcc; + hr = IMediaStreamFilter_GetState(filter, 0, &state); + ok(state == State_Stopped, "Got state %#x.\n", state); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -2774,5 +2805,7 @@ START_TEST(amstream) test_audiostream_set_format(); test_audiostream_receive_connection(); + test_mediastreamfilter_get_state(); + CoUninitialize(); }

1 0

Anton Baskanov : amstream/tests: Refactor test stream to allow multiple instances.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: ed93b25f4d361103c56056941e7a7fa605640922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed93b25f4d361103c5605694… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Mar 27 11:54:31 2020 -0500 amstream/tests: Refactor test stream to allow multiple instances. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 74 ++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 21 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index cfdd8b6c8d..02fea447d0 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -305,25 +305,43 @@ error: } static const GUID test_mspid = {0x88888888}; -static IAMMediaStream teststream; -static LONG teststream_refcount = 1; -static IAMMultiMediaStream *teststream_mmstream; -static IMediaStreamFilter *teststream_filter; -static IFilterGraph *teststream_graph; + +struct teststream +{ + IAMMediaStream IAMMediaStream_iface; + IPin IPin_iface; + LONG refcount; + IAMMultiMediaStream *mmstream; + IMediaStreamFilter *filter; + IFilterGraph *graph; +}; + +static struct teststream *impl_from_IAMMediaStream(IAMMediaStream *iface) +{ + return CONTAINING_RECORD(iface, struct teststream, IAMMediaStream_iface); +} + +static struct teststream *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, struct teststream, IPin_iface); +} static HRESULT WINAPI pin_QueryInterface(IPin *iface, REFIID iid, void **out) { - return IAMMediaStream_QueryInterface(&teststream, iid, out); + struct teststream *stream = impl_from_IPin(iface); + return IAMMediaStream_QueryInterface(&stream->IAMMediaStream_iface, iid, out); } static ULONG WINAPI pin_AddRef(IPin *iface) { - return IAMMediaStream_AddRef(&teststream); + struct teststream *stream = impl_from_IPin(iface); + return IAMMediaStream_AddRef(&stream->IAMMediaStream_iface); } static ULONG WINAPI pin_Release(IPin *iface) { - return IAMMediaStream_Release(&teststream); + struct teststream *stream = impl_from_IPin(iface); + return IAMMediaStream_Release(&stream->IAMMediaStream_iface); } static HRESULT WINAPI pin_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) @@ -439,10 +457,10 @@ static const IPinVtbl pin_vtbl = pin_NewSegment }; -static IPin testpin = {&pin_vtbl}; - static HRESULT WINAPI stream_QueryInterface(IAMMediaStream *iface, REFIID iid, void **out) { + struct teststream *stream = impl_from_IAMMediaStream(iface); + if (winetest_debug > 1) trace("QueryInterface(%s)\n", wine_dbgstr_guid(iid)); if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IMediaStream) || IsEqualGUID(iid, &IID_IAMMediaStream)) @@ -454,7 +472,7 @@ static HRESULT WINAPI stream_QueryInterface(IAMMediaStream *iface, REFIID iid, v else if (IsEqualGUID(iid, &IID_IPin)) { IAMMediaStream_AddRef(iface); - *out = &testpin; + *out = &stream->IPin_iface; return S_OK; } @@ -464,12 +482,14 @@ static HRESULT WINAPI stream_QueryInterface(IAMMediaStream *iface, REFIID iid, v static ULONG WINAPI stream_AddRef(IAMMediaStream *iface) { - return InterlockedIncrement(&teststream_refcount); + struct teststream *stream = impl_from_IAMMediaStream(iface); + return InterlockedIncrement(&stream->refcount); } static ULONG WINAPI stream_Release(IAMMediaStream *iface) { - return InterlockedDecrement(&teststream_refcount); + struct teststream *stream = impl_from_IAMMediaStream(iface); + return InterlockedDecrement(&stream->refcount); } static HRESULT WINAPI stream_GetMultiMediaStream(IAMMediaStream *iface, IMultiMediaStream **mmstream) @@ -526,22 +546,25 @@ static HRESULT WINAPI stream_SetState(IAMMediaStream *iface, FILTER_STATE state) static HRESULT WINAPI stream_JoinAMMultiMediaStream(IAMMediaStream *iface, IAMMultiMediaStream *mmstream) { + struct teststream *stream = impl_from_IAMMediaStream(iface); if (winetest_debug > 1) trace("JoinAMMultiMediaStream(%p)\n", mmstream); - teststream_mmstream = mmstream; + stream->mmstream = mmstream; return S_OK; } static HRESULT WINAPI stream_JoinFilter(IAMMediaStream *iface, IMediaStreamFilter *filter) { + struct teststream *stream = impl_from_IAMMediaStream(iface); if (winetest_debug > 1) trace("JoinFilter(%p)\n", filter); - teststream_filter = filter; + stream->filter = filter; return S_OK; } static HRESULT WINAPI stream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *graph) { + struct teststream *stream = impl_from_IAMMediaStream(iface); if (winetest_debug > 1) trace("JoinFilterGraph(%p)\n", graph); - teststream_graph = graph; + stream->graph = graph; return S_OK; } @@ -563,7 +586,13 @@ static const IAMMediaStreamVtbl stream_vtbl = stream_JoinFilterGraph, }; -static IAMMediaStream teststream = {&stream_vtbl}; +static void teststream_init(struct teststream *stream) +{ + memset(stream, 0, sizeof(*stream)); + stream->IAMMediaStream_iface.lpVtbl = &stream_vtbl; + stream->IPin_iface.lpVtbl = &pin_vtbl; + stream->refcount = 1; +} #define check_enum_stream(a,b,c,d) check_enum_stream_(__LINE__,a,b,c,d) static void check_enum_stream_(int line, IAMMultiMediaStream *mmstream, @@ -616,6 +645,7 @@ static void test_add_stream(void) IMediaStream *video_stream, *audio_stream, *stream; IDirectDrawMediaStream *ddraw_stream; IMediaStreamFilter *stream_filter; + struct teststream teststream; IDirectDraw *ddraw, *ddraw2; IEnumFilters *enum_filters; IBaseFilter *filters[3]; @@ -624,6 +654,8 @@ static void test_add_stream(void) CLSID clsid; HRESULT hr; + teststream_init(&teststream); + hr = IAMMultiMediaStream_GetFilter(mmstream, &stream_filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -687,9 +719,9 @@ static void test_add_stream(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(stream == (IMediaStream *)&teststream, "Streams didn't match.\n"); if (hr == S_OK) IMediaStream_Release(stream); - todo_wine ok(teststream_mmstream == mmstream, "IAMMultiMediaStream objects didn't match.\n"); - ok(teststream_filter == stream_filter, "IMediaStreamFilter objects didn't match.\n"); - todo_wine ok(!!teststream_graph, "Expected a non-NULL graph.\n"); + todo_wine ok(teststream.mmstream == mmstream, "IAMMultiMediaStream objects didn't match.\n"); + ok(teststream.filter == stream_filter, "IMediaStreamFilter objects didn't match.\n"); + todo_wine ok(!!teststream.graph, "Expected a non-NULL graph.\n"); check_enum_stream(mmstream, stream_filter, 0, video_stream); check_enum_stream(mmstream, stream_filter, 1, audio_stream); @@ -725,7 +757,7 @@ static void test_add_stream(void) ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IMediaStream_Release(audio_stream); ok(!ref, "Got outstanding refcount %d.\n", ref); - ok(teststream_refcount == 1, "Got outstanding refcount %d.\n", ref); + ok(teststream.refcount == 1, "Got outstanding refcount %d.\n", teststream.refcount); /* The return parameter is optional. */

1 0