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

Jacek Caban : dbghelp: Use DWARF registry mapping quirk only for actual macho modules.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 3b6c268380d703079fa3c5ca06f67b6feb02487f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6c268380d703079fa3c5ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:01:02 2020 +0200 dbghelp: Use DWARF registry mapping quirk only for actual macho modules. Fixes handling DWARF in PE on macOS. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_i386.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 6636d445c5..fd808a0d32 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -520,13 +520,11 @@ static unsigned i386_map_dwarf_register(unsigned regno, const struct module* mod case 3: reg = CV_REG_EBX; break; case 4: case 5: -#ifdef __APPLE__ /* On OS X, DWARF eh_frame uses a different mapping for the registers. It's apparently the mapping as emitted by GCC, at least at some point in its history. */ - if (eh_frame) + if (eh_frame && module->type == DMT_MACHO) reg = (regno == 4) ? CV_REG_EBP : CV_REG_ESP; else -#endif reg = (regno == 4) ? CV_REG_ESP : CV_REG_EBP; break; case 6: reg = CV_REG_ESI; break;

1 0

Zebediah Figura : kernel32: Don't fail ReplaceFile() if unable to delete a generated backup.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: bae4776c571cf975be1689594f4caf93ad23e0ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae4776c571cf975be168959… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 28 23:09:35 2020 -0500 kernel32: Don't fail ReplaceFile() if unable to delete a generated backup. Windows will just leave the file if unable to delete it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 6 +----- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 2a2ace5dd8..3b2d82cc37 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -507,11 +507,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa || !MoveFileExW( lpReplacedFileName, temp_file, MOVEFILE_REPLACE_EXISTING )) return FALSE; - if (!DeleteFileW( temp_file )) - { - SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED ); - return FALSE; - } + DeleteFileW( temp_file ); } /* diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 41d03c14fa..e8a31c6e74 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3841,12 +3841,12 @@ static void test_ReplaceFileA(void) ok(ret, "got error %u\n", GetLastError()); ret = ReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %u\n", GetLastError()); CloseHandle(mapping); CloseHandle(hReplacedFile); ret = DeleteFileA(replaced); - todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %u\n", GetLastError()); } /*

1 0

Gerald Pfeifer : dbghelp: Define NT_GNU_BUILD_ID regardless of whether __ELF__ is defined.
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Zebediah Figura : server: Check whether the new file name is executable.
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Daniel Lehman : loader: Add Marquesas Standard Time Zone.
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Daniel Lehman : loader: Add Bougainville Standard Time Zone.
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Daniel Lehman : loader: Add Chatham Islands Standard Time Zone.
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Alexandre Julliard : Wine release 5.5
by Alexandre Julliard March 27, 2020

March 27, 2020

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

Matteo Bruni : d3d10/tests: Improve compare_matrix() ok() messages.
by Alexandre Julliard March 27, 2020

March 27, 2020

Module: wine Branch: master Commit: 9b28ab83d6fbf9ba2aead07ec99481e86187660e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b28ab83d6fbf9ba2aead07e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 27 21:05:10 2020 +0100 d3d10/tests: Improve compare_matrix() ok() messages. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 7b9bcfb50d..02b91735f1 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5168,7 +5168,8 @@ static void compare_matrix(const char *name, unsigned int line, struct d3d10_mat for (col = 0; col < col_count; ++col) { tmp = !transpose ? b->m[row][col] : b->m[col][row]; - ok(a->m[row][col] == tmp, "Variable %s, line %d, got unexpected value 0x%08x.\n", name, line, + ok_(__FILE__, line)(a->m[row][col] == tmp, + "Variable %s (%u, %u), got unexpected value 0x%08x.\n", name, row, col, *(unsigned int *)&tmp); } }

1 0

Anton Baskanov : amstream: Implement MediaStreamFilter::Stop, ::Pause, and ::Run.
by Alexandre Julliard March 27, 2020

March 27, 2020

Module: wine Branch: master Commit: 2006621683639b29be59e584af156b72055c43db URL: https://source.winehq.org/git/wine.git/?a=commit;h=2006621683639b29be59e584… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Mar 27 11:54:32 2020 -0500 amstream: Implement MediaStreamFilter::Stop, ::Pause, and ::Run. 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 | 48 ++++++++++++++-- dlls/amstream/tests/amstream.c | 124 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 162 insertions(+), 10 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 1cb2ca71ba..fb9b1d9aee 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -242,25 +242,61 @@ static HRESULT WINAPI filter_GetClassID(IMediaStreamFilter *iface, CLSID *clsid) return S_OK; } +static void set_state(struct filter *filter, FILTER_STATE state) +{ + if (filter->state != state) + { + ULONG i; + + for (i = 0; i < filter->nb_streams; ++i) + IAMMediaStream_SetState(filter->streams[i], state); + filter->state = state; + } +} + static HRESULT WINAPI filter_Stop(IMediaStreamFilter *iface) { - FIXME("(%p)->(): Stub!\n", iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&filter->cs); + + set_state(filter, State_Stopped); + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_Pause(IMediaStreamFilter *iface) { - FIXME("(%p)->(): Stub!\n", iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&filter->cs); + + set_state(filter, State_Paused); + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start) { - FIXME("(%p)->(%s): Stub!\n", iface, wine_dbgstr_longlong(start)); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start)); + + EnterCriticalSection(&filter->cs); + + set_state(filter, State_Running); + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_GetState(IMediaStreamFilter *iface, DWORD timeout, FILTER_STATE *state) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 02fea447d0..82a833ad6f 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -311,9 +311,12 @@ struct teststream IAMMediaStream IAMMediaStream_iface; IPin IPin_iface; LONG refcount; + GUID mspid; IAMMultiMediaStream *mmstream; IMediaStreamFilter *filter; IFilterGraph *graph; + FILTER_STATE state; + HRESULT set_state_result; }; static struct teststream *impl_from_IAMMediaStream(IAMMediaStream *iface) @@ -500,9 +503,12 @@ static HRESULT WINAPI stream_GetMultiMediaStream(IAMMediaStream *iface, IMultiMe static HRESULT WINAPI stream_GetInformation(IAMMediaStream *iface, MSPID *id, STREAM_TYPE *type) { + struct teststream *stream = impl_from_IAMMediaStream(iface); if (winetest_debug > 1) trace("GetInformation(%p, %p)\n", id, type); - *id = test_mspid; - ok(!type, "Got unexpected type %p.\n", type); + if (id) + *id = stream->mspid; + if (type) + *type = STREAMTYPE_READ; return S_OK; } @@ -540,8 +546,11 @@ static HRESULT WINAPI stream_Initialize(IAMMediaStream *iface, IUnknown *source, static HRESULT WINAPI stream_SetState(IAMMediaStream *iface, FILTER_STATE state) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct teststream *stream = impl_from_IAMMediaStream(iface); + if (winetest_debug > 1) trace("SetState(%#x)\n", state); + if (SUCCEEDED(stream->set_state_result)) + stream->state = state; + return stream->set_state_result; } static HRESULT WINAPI stream_JoinAMMultiMediaStream(IAMMediaStream *iface, IAMMultiMediaStream *mmstream) @@ -592,6 +601,8 @@ static void teststream_init(struct teststream *stream) stream->IAMMediaStream_iface.lpVtbl = &stream_vtbl; stream->IPin_iface.lpVtbl = &pin_vtbl; stream->refcount = 1; + stream->mspid = test_mspid; + stream->set_state_result = S_OK; } #define check_enum_stream(a,b,c,d) check_enum_stream_(__LINE__,a,b,c,d) @@ -2800,6 +2811,110 @@ void test_mediastreamfilter_get_state(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +void check_mediastreamfilter_state(FILTER_STATE expected_state, HRESULT (*set_state)(IMediaStreamFilter *), + HRESULT (*reset_state)(IMediaStreamFilter *)) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + struct teststream teststream, teststream2; + IMediaStreamFilter *filter; + FILTER_STATE state; + HRESULT hr; + ULONG ref; + + teststream_init(&teststream); + teststream_init(&teststream2); + + teststream2.mspid.Data2 = 1; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)&teststream, &teststream.mspid, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)&teststream2, &teststream2.mspid, 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 != NULL, "Expected non-null filter\n"); + + hr = reset_state(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + teststream.state = 0xcc; + teststream2.state = 0xcc; + hr = set_state(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(teststream.state == expected_state, "Got state %#x.\n", teststream.state); + ok(teststream2.state == expected_state, "Got state %#x.\n", teststream2.state); + hr = IMediaStreamFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == expected_state, "Got state %#x.\n", state); + + teststream.state = 0xcc; + teststream2.state = 0xcc; + hr = set_state(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(teststream.state == 0xcc, "Got state %#x.\n", teststream.state); + ok(teststream2.state == 0xcc, "Got state %#x.\n", teststream2.state); + + hr = reset_state(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + teststream.set_state_result = E_FAIL; + teststream.state = 0xcc; + teststream2.state = 0xcc; + hr = set_state(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(teststream.state == 0xcc, "Got state %#x.\n", teststream.state); + ok(teststream2.state == expected_state, "Got state %#x.\n", teststream2.state); + hr = IMediaStreamFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == expected_state, "Got state %#x.\n", state); + + hr = reset_state(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + teststream.set_state_result = E_FAIL; + teststream2.set_state_result = E_FAIL; + teststream.state = 0xcc; + teststream2.state = 0xcc; + hr = set_state(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(teststream.state == 0xcc, "Got state %#x.\n", teststream.state); + ok(teststream2.state == 0xcc, "Got state %#x.\n", teststream2.state); + hr = IMediaStreamFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == expected_state, "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); + ok(teststream.refcount == 1, "Got outstanding refcount %d.\n", teststream.refcount); + ok(teststream2.refcount == 1, "Got outstanding refcount %d.\n", teststream2.refcount); +} + +static HRESULT mediastreamfilter_stop(IMediaStreamFilter *filter) +{ + return IMediaStreamFilter_Stop(filter); +} + +static HRESULT mediastreamfilter_pause(IMediaStreamFilter *filter) +{ + return IMediaStreamFilter_Pause(filter); +} + +static HRESULT mediastreamfilter_run(IMediaStreamFilter *filter) +{ + return IMediaStreamFilter_Run(filter, 0); +} + +void test_mediastreamfilter_stop_pause_run(void) +{ + check_mediastreamfilter_state(State_Stopped, mediastreamfilter_stop, mediastreamfilter_run); + check_mediastreamfilter_state(State_Paused, mediastreamfilter_pause, mediastreamfilter_stop); + check_mediastreamfilter_state(State_Running, mediastreamfilter_run, mediastreamfilter_stop); +} + START_TEST(amstream) { HANDLE file; @@ -2838,6 +2953,7 @@ START_TEST(amstream) test_audiostream_receive_connection(); test_mediastreamfilter_get_state(); + test_mediastreamfilter_stop_pause_run(); CoUninitialize(); }

1 0