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

Alexandre Julliard : configure: Cache result of the msgfmt check.
by Alexandre Julliard April 15, 2019

April 15, 2019

Module: wine Branch: master Commit: 9d250fbfa2125b2fa7d824bf8af5bbd3a304ab8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d250fbfa2125b2fa7d824bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 14 14:59:37 2019 +0200 configure: Cache result of the msgfmt check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +++++++++------ configure.ac | 13 ++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/configure b/configure index bb0259a..3e87c86 100755 --- a/configure +++ b/configure @@ -6712,7 +6712,6 @@ $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } with_gettext=yes with_gettextpo=yes - { ac_cv_header_gettext_po_h=; unset ac_cv_header_gettext_po_h;} fi test "x$with_gettext" != xno || MSGFMT=false @@ -6720,6 +6719,9 @@ if test "$MSGFMT" != "false" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether msgfmt supports contexts" >&5 $as_echo_n "checking whether msgfmt supports contexts... " >&6; } +if ${wine_cv_msgfmt_contexts+:} false; then : + $as_echo_n "(cached) " >&6 +else cat >conftest.po <<EOF # comment msgctxt "ctxt" @@ -6728,14 +6730,15 @@ msgstr "str" EOF if $MSGFMT -o /dev/null conftest.po 2>&5 then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + wine_cv_msgfmt_contexts=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - MSGFMT=false + wine_cv_msgfmt_contexts=no fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_msgfmt_contexts" >&5 +$as_echo "$wine_cv_msgfmt_contexts" >&6; } + test $wine_cv_msgfmt_contexts != no || MSGFMT=false +fi if test "$MSGFMT" = false; then : case "x$with_gettext" in x) as_fn_append wine_warnings "|gettext tools not found (or too old), translations won't be built." ;; diff --git a/configure.ac b/configure.ac index e2b7635..719afe6 100644 --- a/configure.ac +++ b/configure.ac @@ -366,14 +366,13 @@ else dnl Maintainer mode requires gettext with_gettext=yes with_gettextpo=yes - AS_UNSET(ac_cv_header_gettext_po_h) fi test "x$with_gettext" != xno || MSGFMT=false if test "$MSGFMT" != "false" then - AC_MSG_CHECKING([whether msgfmt supports contexts]) - cat >conftest.po <<EOF + AC_CACHE_CHECK([whether msgfmt supports contexts],wine_cv_msgfmt_contexts, + [cat >conftest.po <<EOF # comment msgctxt "ctxt" msgid "id" @@ -381,11 +380,11 @@ msgstr "str" EOF if $MSGFMT -o /dev/null conftest.po 2>&AS_MESSAGE_LOG_FD then - AC_MSG_RESULT([yes]) + wine_cv_msgfmt_contexts=yes else - AC_MSG_RESULT([no]) - MSGFMT=false - fi + wine_cv_msgfmt_contexts=no + fi]) + test $wine_cv_msgfmt_contexts != no || MSGFMT=false fi WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], [gettext tools not found (or too old), translations won't be built.],

1 0

Alexandre Julliard : configure: Cache result of the cross-compiler check.
by Alexandre Julliard April 15, 2019

April 15, 2019

Module: wine Branch: master Commit: 2b5dc2ebd57d3119be6a9cb63482fbb434b8bf34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b5dc2ebd57d3119be6a9cb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 14 14:48:39 2019 +0200 configure: Cache result of the cross-compiler check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 37 ++++++++++++++++++++++--------------- configure.ac | 29 +++++++++++++++-------------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 15f7848..31fcebb 100755 --- a/configure +++ b/configure @@ -9679,7 +9679,10 @@ test -n "$CROSSCC" || CROSSCC="false" CFLAGS=$CROSSCFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CROSSCC works" >&5 $as_echo_n "checking whether $CROSSCC works... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if ${wine_cv_crosscc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9691,23 +9694,27 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - set x $CROSSCC - shift - while test $# -ge 1 - do - case "$1" in - *-gcc) CROSSTARGET=`expr "$1" : '$.*$-gcc'` ;; - *-clang) CROSSTARGET=`expr "$1" : '$.*$-clang'` ;; - esac - shift - done + wine_cv_crosscc=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + wine_cv_crosscc=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_crosscc" >&5 +$as_echo "$wine_cv_crosscc" >&6; } + if test $wine_cv_crosscc = yes + then + set x $CROSSCC + shift + while test $# -ge 1 + do + case "$1" in + *-gcc) CROSSTARGET=`expr "$1" : '$.*$-gcc'` ;; + *-clang) CROSSTARGET=`expr "$1" : '$.*$-clang'` ;; + esac + shift + done + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-strict-aliasing" >&5 $as_echo_n "checking whether the cross-compiler supports -fno-strict-aliasing... " >&6; } if ${ac_cv_crosscflags__fno_strict_aliasing+:} false; then : diff --git a/configure.ac b/configure.ac index b459e0e..51ca0fa 100644 --- a/configure.ac +++ b/configure.ac @@ -1007,20 +1007,21 @@ then CC="$CROSSCC" CFLAGS=$CROSSCFLAGS - AC_MSG_CHECKING([whether $CROSSCC works]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes]) - set x $CROSSCC - shift - while test $# -ge 1 - do - case "$1" in - *-gcc) CROSSTARGET=`expr "$1" : '$.*$-gcc'` ;; - *-clang) CROSSTARGET=`expr "$1" : '$.*$-clang'` ;; - esac - shift - done], - [AC_MSG_RESULT([no])]) + AC_CACHE_CHECK([whether $CROSSCC works], wine_cv_crosscc, + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],[wine_cv_crosscc=yes],[wine_cv_crosscc=no])]) + if test $wine_cv_crosscc = yes + then + set x $CROSSCC + shift + while test $# -ge 1 + do + case "$1" in + *-gcc) CROSSTARGET=`expr "$1" : '$.*$-gcc'` ;; + *-clang) CROSSTARGET=`expr "$1" : '$.*$-clang'` ;; + esac + shift + done + fi WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"])

1 0

Józef Kucia : build: Print widl in configuration summary.
by Alexandre Julliard April 15, 2019

April 15, 2019

Module: vkd3d Branch: master Commit: 393f1d858da8e4aef867f46fb9b3c2925261eeb8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=393f1d858da8e4aef867f46… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 15 10:13:55 2019 +0200 build: Print widl in configuration summary. 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> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 28f2ac9..02f9028 100644 --- a/configure.ac +++ b/configure.ac @@ -129,6 +129,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], AS_ECHO([" Configuration summary for $PACKAGE $VERSION + widl: ${WIDL} + Have XCB: ${HAVE_XCB} Have SPIRV-Tools: ${with_spirv_tools}

1 0

Józef Kucia : build: Redirect stderr to /dev/ null in VKD3D_PROG_WIDL.
by Alexandre Julliard April 15, 2019

April 15, 2019

Module: vkd3d Branch: master Commit: 68945ffcf32af516f21ae59b38fb84f7d3288b66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=68945ffcf32af516f21ae59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 15 10:13:54 2019 +0200 build: Redirect stderr to /dev/null in VKD3D_PROG_WIDL. 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> --- m4/widl.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/widl.m4 b/m4/widl.m4 index 2849356..6d22606 100644 --- a/m4/widl.m4 +++ b/m4/widl.m4 @@ -5,7 +5,7 @@ AC_DEFUN([VKD3D_PROG_WIDL], AS_IF([test "x$WIDL" != "xno"], [AC_MSG_CHECKING([checking whether widl version >= $1.$2]) -vkd3d_widl_version=`$WIDL -V | $SED -E '/version/{s/.* version (.*)/\1/;q;}'` +vkd3d_widl_version=`$WIDL -V 2>/dev/null | $SED -E '/version/{s/.* version (.*)/\1/;q;}'` AX_COMPARE_VERSION([$vkd3d_widl_version], [ge], [$1.$2], [AC_MSG_RESULT([yes ($vkd3d_widl_version)])],

1 0

Józef Kucia : build: Add linker scripts to EXTRA_*_DEPENDENCIES.
by Alexandre Julliard April 15, 2019

April 15, 2019

Module: vkd3d Branch: master Commit: 6b1fa5692497c72a16a94594e76cd73dcad0fcb1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b1fa5692497c72a16a9459… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 12 17:13:17 2019 +0200 build: Add linker scripts to EXTRA_*_DEPENDENCIES. 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> --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2b5bca0..299ec26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,6 +85,7 @@ libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map +EXTRA_libvkd3d_shader_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-shader/vkd3d_shader.map endif libvkd3d_la_SOURCES = \ @@ -110,6 +111,7 @@ libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map +EXTRA_libvkd3d_la_DEPENDENCIES = $(srcdir)/libs/vkd3d/vkd3d.map endif libvkd3d_utils_la_SOURCES = \ @@ -120,6 +122,7 @@ libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map +EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map endif EXTRA_DIST = LICENSE

1 0

Alexandre Julliard : Wine release 4.6
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: website Branch: master Commit: d79de0dd2e6205d6b521fdc44f2909bc224887e7 URL: https://source.winehq.org/git/website.git/?a=commit;h=d79de0dd2e6205d6b521f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:12:02 2019 +0200 Wine release 4.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019041201.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/news/en/2019041201.xml b/news/en/2019041201.xml new file mode 100644 index 0000000..788afba --- /dev/null +++ b/news/en/2019041201.xml @@ -0,0 +1,20 @@ +<news> +<date>April 12, 2019</date> +<title>Wine 4.6 Released</title> +<body> + The Wine development release 4.6 is now available. + <a href="{$root}/announce/4.6">What's new</a> in this release: +<ul> + <li>Beginnings of a Vulkan backend for WineD3D.</li> + <li>Support for loading Mono libraries from a shared location.</li> + <li>Libwine.dll no longer needed when using Wine DLLs on Windows.</li> + <li>Regression tests compiled directly to PE format.</li> + <li>Support for the Split Button Common Control.</li> + <li>Complex structs support in the typelib marshaller.</li> + <li>Video capture ported to Video4Linux version 2.</li> + <li>Initial version of the Debug Engine DLL.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.6.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

Paul Gofman : xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start().
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: a5b22c86b4d46fa8443cc2bee8b91d237eb8996b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5b22c86b4d46fa8443cc2be… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 11 11:30:50 2019 +0300 xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start(). It is tested that EBX register is not preserved by IXAudio2VoiceCallback_OnVoiceProcessingPassStart callback in League of Legends. It doesn't lead to crash in the present xaudio, while it might still be a potential issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46870 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 18306a1..cbbedc4 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -41,7 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #if XAUDIO2_VER != 0 && defined(__i386__) -/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */ +/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi; + * League of Legends uses a callback which corrupts %ebx. */ #define IXAudio2VoiceCallback_OnVoiceProcessingPassStart(a, b) call_on_voice_processing_pass_start(a, b) extern void call_on_voice_processing_pass_start(IXAudio2VoiceCallback *This, UINT32 BytesRequired); __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, @@ -54,13 +55,17 @@ __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") - "subl $8,%esp\n\t" + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + "subl $4,%esp\n\t" "pushl 12(%ebp)\n\t" /* BytesRequired */ "pushl 8(%ebp)\n\t" /* This */ "movl 8(%ebp),%eax\n\t" "movl 0(%eax),%eax\n\t" "call *0(%eax)\n\t" /* This->lpVtbl->OnVoiceProcessingPassStart */ - "leal -8(%ebp),%esp\n\t" + "leal -12(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") "popl %edi\n\t" __ASM_CFI(".cfi_same_value %edi\n\t") "popl %esi\n\t"

1 0

Zebediah Figura : qcap/tests: Add more tests for querying smart tee pin information.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: a770ebe3ad4a4d5ae0a12f06d5e4a96c126ef8f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a770ebe3ad4a4d5ae0a12f06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:55 2019 -0500 qcap/tests: Add more tests for querying smart tee pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 143 ++++++++++++++++++++++++++++----------- 1 file changed, 104 insertions(+), 39 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index f931d0b..79d296d 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -266,6 +266,109 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_smart_tee(); + PIN_DIRECTION dir; + PIN_INFO info; + ULONG count; + 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); + 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); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + 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, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, capture_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + 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_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, capture_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + 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_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, capture_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, preview_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + 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_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, preview_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + 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_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, preview_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -1885,7 +1988,6 @@ static void test_smart_tee_filter(void) int pinNumber = 0; IMemInputPin *memInputPin = NULL; IEnumMediaTypes *enumMediaTypes = NULL; - ULONG nPin = 0; hr = CoCreateInstance(&CLSID_SmartTee, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&smartTeeFilter); @@ -1908,55 +2010,24 @@ static void test_smart_tee_filter(void) while (IEnumPins_Next(enumPins, 1, &pin, NULL) == S_OK) { - LPWSTR id = NULL; - PIN_INFO pinInfo; - memset(&pinInfo, 0, sizeof(pinInfo)); - hr = IPin_QueryPinInfo(pin, &pinInfo); - ok(SUCCEEDED(hr), "QueryPinInfo failed, hr=0x%08x\n", hr); - if (FAILED(hr)) - goto endwhile; - - ok(pinInfo.pFilter == smartTeeFilter, "pin's filter isn't the filter owning the pin\n"); if (pinNumber == 0) { - static const WCHAR wszInput[] = {'I','n','p','u','t',0}; - ok(pinInfo.dir == PINDIR_INPUT, "pin 0 isn't an input pin\n"); - ok(!lstrcmpW(pinInfo.achName, wszInput), "pin 0 is called %s, not 'Input'\n", wine_dbgstr_w(pinInfo.achName)); - hr = IPin_QueryId(pin, &id); - ok(SUCCEEDED(hr), "IPin_QueryId() failed with 0x%08x\n", hr); - ok(!lstrcmpW(id, wszInput), "pin 0's id is %s, not 'Input'\n", wine_dbgstr_w(id)); inputPin = pin; IPin_AddRef(inputPin); } else if (pinNumber == 1) { - static const WCHAR wszCapture[] = {'C','a','p','t','u','r','e',0}; - ok(pinInfo.dir == PINDIR_OUTPUT, "pin 1 isn't an output pin\n"); - ok(!lstrcmpW(pinInfo.achName, wszCapture), "pin 1 is called %s, not 'Capture'\n", wine_dbgstr_w(pinInfo.achName)); - hr = IPin_QueryId(pin, &id); - ok(SUCCEEDED(hr), "IPin_QueryId() failed with 0x%08x\n", hr); - ok(!lstrcmpW(id, wszCapture), "pin 1's id is %s, not 'Capture'\n", wine_dbgstr_w(id)); capturePin = pin; IPin_AddRef(capturePin); } else if (pinNumber == 2) { - static const WCHAR wszPreview[] = {'P','r','e','v','i','e','w',0}; - ok(pinInfo.dir == PINDIR_OUTPUT, "pin 2 isn't an output pin\n"); - ok(!lstrcmpW(pinInfo.achName, wszPreview), "pin 2 is called %s, not 'Preview'\n", wine_dbgstr_w(pinInfo.achName)); - hr = IPin_QueryId(pin, &id); - ok(SUCCEEDED(hr), "IPin_QueryId() failed with 0x%08x\n", hr); - ok(!lstrcmpW(id, wszPreview), "pin 2's id is %s, not 'Preview'\n", wine_dbgstr_w(id)); previewPin = pin; IPin_AddRef(previewPin); } else ok(0, "pin %d isn't supposed to exist\n", pinNumber); - endwhile: - if (pinInfo.pFilter) - IBaseFilter_Release(pinInfo.pFilter); - CoTaskMemFree(id); IPin_Release(pin); pinNumber++; } @@ -2010,13 +2081,6 @@ static void test_smart_tee_filter(void) hr = IPin_EnumMediaTypes(previewPin, &enumMediaTypes); ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); - hr = IPin_QueryInternalConnections(inputPin, NULL, &nPin); - ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr); - hr = IPin_QueryInternalConnections(capturePin, NULL, &nPin); - ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr); - hr = IPin_QueryInternalConnections(previewPin, NULL, &nPin); - ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr); - test_smart_tee_filter_in_graph(smartTeeFilter, inputPin, capturePin, previewPin); end: @@ -2261,6 +2325,7 @@ START_TEST(smartteefilter) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Henri Verbeet : wined3d: Explicitly create the implicit swapchain.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: b15685355c45c0fffb4f0dc5518c8c6ee0f595c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b15685355c45c0fffb4f0dc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:47 2019 +0430 wined3d: Explicitly create the implicit swapchain. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 28 ----------- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 59 +++++++++-------------- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 75 ++++++++++++------------------ dlls/ddraw/ddraw.c | 97 ++++++++++++++++---------------------- dlls/dxgi/device.c | 74 ++++++++++++++--------------- dlls/dxgi/dxgi_private.h | 1 + dlls/wined3d/device.c | 103 ++++++++++++++++++++--------------------- dlls/wined3d/swapchain.c | 21 ++++++++- dlls/wined3d/wined3d.spec | 2 - dlls/wined3d/wined3d_private.h | 3 ++ include/wine/wined3d.h | 5 +- include/wine/winedxgi.idl | 5 -- 14 files changed, 201 insertions(+), 276 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b15685355c45c0fffb4f…

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_init_gdi().
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: b599e8e3a04cc80bd09647fd784eac70dc2e411d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b599e8e3a04cc80bd09647fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:44 2019 +0430 wined3d: Get rid of wined3d_device_init_gdi(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 13 +++---- dlls/wined3d/device.c | 87 ++++++++++++++++------------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 34 insertions(+), 68 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8467fbf..f4aabf4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -569,6 +569,9 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, TRACE("ddraw %p.\n", ddraw); + if (ddraw->flags & DDRAW_NO3D) + return wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc); + if (!window || window == GetDesktopWindow()) { window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "Hidden D3D Window", @@ -594,8 +597,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ ddraw->flags |= DDRAW_D3D_INITIALIZED; - hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc))) { ddraw->flags &= ~DDRAW_D3D_INITIALIZED; return hr; @@ -638,12 +640,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win swapchain_desc.windowed = windowed; swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; - if (!(ddraw->flags & DDRAW_NO3D)) - hr = ddraw_attach_d3d_device(ddraw, &swapchain_desc); - else - hr = wined3d_device_init_gdi(ddraw->wined3d_device, &swapchain_desc); - - if (FAILED(hr)) + if (FAILED(hr = ddraw_attach_d3d_device(ddraw, &swapchain_desc))) { ERR("Failed to create swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1d870c0..1424ed4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1079,8 +1079,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; - if (device->wined3d->flags & WINED3D_NO3D) - return WINED3DERR_INVALIDCALL; memset(device->fb.render_targets, 0, sizeof(device->fb.render_targets)); @@ -1120,26 +1118,40 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, } device->swapchains[0] = swapchain; - if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) - goto err_out; - device_init_swapchain_state(device, swapchain); + if (device->wined3d->flags & WINED3D_NO3D) + { + if (!(device->blitter = wined3d_cpu_blitter_create())) + { + ERR("Failed to create CPU blitter.\n"); + heap_free(device->swapchains); + device->swapchain_count = 0; + goto err_out; + } + } + else + { + if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) + goto err_out; + device_init_swapchain_state(device, swapchain); - device->contexts[0]->last_was_rhw = 0; + device->contexts[0]->last_was_rhw = 0; - TRACE("All defaults now set up.\n"); + TRACE("All defaults now set up.\n"); - /* Clear the screen */ - if (device->back_buffer_view) - clear_flags |= WINED3DCLEAR_TARGET; - if (swapchain_desc->enable_auto_depth_stencil) - clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; - if (clear_flags) - wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); + /* Clear the screen */ + if (device->back_buffer_view) + clear_flags |= WINED3DCLEAR_TARGET; + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); - device->d3d_initialized = TRUE; + device->d3d_initialized = TRUE; + + if (wined3d_settings.logo) + device_load_logo(device, wined3d_settings.logo); + } - if (wined3d_settings.logo) - device_load_logo(device, wined3d_settings.logo); return WINED3D_OK; err_out: @@ -1153,47 +1165,6 @@ err_out: return hr; } -HRESULT CDECL wined3d_device_init_gdi(struct wined3d_device *device, - struct wined3d_swapchain_desc *swapchain_desc) -{ - struct wined3d_swapchain *swapchain = NULL; - HRESULT hr; - - TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); - - /* Setup the implicit swapchain */ - TRACE("Creating implicit swapchain\n"); - hr = device->device_parent->ops->create_swapchain(device->device_parent, - swapchain_desc, &swapchain); - if (FAILED(hr)) - { - WARN("Failed to create implicit swapchain\n"); - goto err_out; - } - - device->swapchain_count = 1; - if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) - { - ERR("Out of memory!\n"); - goto err_out; - } - device->swapchains[0] = swapchain; - - if (!(device->blitter = wined3d_cpu_blitter_create())) - { - ERR("Failed to create CPU blitter.\n"); - heap_free(device->swapchains); - device->swapchain_count = 0; - goto err_out; - } - - return WINED3D_OK; - -err_out: - wined3d_swapchain_decref(swapchain); - return hr; -} - static void device_free_sampler(struct wine_rb_entry *entry, void *context) { struct wined3d_sampler *sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 75b9fe1..1422c65 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -121,7 +121,6 @@ @ cdecl wined3d_device_get_wined3d(ptr) @ cdecl wined3d_device_incref(ptr) @ cdecl wined3d_device_init_3d(ptr ptr) -@ cdecl wined3d_device_init_gdi(ptr ptr) @ cdecl wined3d_device_multiply_transform(ptr long ptr) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 51fb7e6..e943e0d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2364,7 +2364,6 @@ struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wine struct wined3d * __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); -HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); void __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device,

1 0

Nikolay Sivov : dbgeng: Update stub to IDebugSymbols3.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: cb32c035d900b0f7641c54a9c0577a8ff1893abb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb32c035d900b0f7641c54a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 12 18:01:29 2019 +0300 dbgeng: Update stub to IDebugSymbols3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 795 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 733 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb32c035d900b0f7641c…

1 0

Alexandre Julliard : configure: Set wine_makedep variable outside of the cache check.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: c19da578f59b8dda5274f6bf3e982cf4a7c2b181 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19da578f59b8dda5274f6bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 16:22:15 2019 +0200 configure: Set wine_makedep variable outside of the cache check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 33 +++++++++++++++++---------------- configure.ac | 29 ++++++++++++++--------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/configure b/configure index 5733ea7..529c2df 100755 --- a/configure +++ b/configure @@ -5711,25 +5711,26 @@ else wine_cv_toolsdir="$with_wine64" fi fi - if test -z "$wine_cv_toolsdir"; then - wine_makedep=tools/makedep - wine_cv_toolsdir="\$(top_builddir)" - elif test -d "$wine_cv_toolsdir/tools/winebuild"; then - wine_makedep=$wine_cv_toolsdir/tools/makedep - case "$wine_cv_toolsdir" in - /*) ;; - *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; - esac - enable_tools=${enable_tools:-no} - test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5 - else - as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 - fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_toolsdir" >&5 $as_echo "$wine_cv_toolsdir" >&6; } -TOOLSDIR=$wine_cv_toolsdir - +if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep + TOOLSDIR="\$(top_builddir)" + +elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep + case "$wine_cv_toolsdir" in + /*) TOOLSDIR=$wine_cv_toolsdir + ;; + *) TOOLSDIR="\$(top_builddir)/$wine_cv_toolsdir" + ;; + esac + enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5 +else + as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 +fi if test -n "$host_alias" -a "$host_alias" != "$build_alias" then TARGETFLAGS="-b $host_alias $TARGETFLAGS" diff --git a/configure.ac b/configure.ac index 4dbb7f4..02e7e9e 100644 --- a/configure.ac +++ b/configure.ac @@ -243,22 +243,21 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, elif test -n "$with_wine64"; then wine_cv_toolsdir="$with_wine64" fi - fi - if test -z "$wine_cv_toolsdir"; then - wine_makedep=tools/makedep - wine_cv_toolsdir="\$(top_builddir)" - elif test -d "$wine_cv_toolsdir/tools/winebuild"; then - wine_makedep=$wine_cv_toolsdir/tools/makedep - case "$wine_cv_toolsdir" in - /*) ;; - *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; - esac - enable_tools=${enable_tools:-no} - test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir]) - else - AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) fi]) -AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) +if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep + AC_SUBST(TOOLSDIR,"\$(top_builddir)") +elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep + case "$wine_cv_toolsdir" in + /*) AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) ;; + *) AC_SUBST(TOOLSDIR,"\$(top_builddir)/$wine_cv_toolsdir") ;; + esac + enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir]) +else + AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) +fi if test -n "$host_alias" -a "$host_alias" != "$build_alias" then AC_SUBST(TARGETFLAGS,"-b $host_alias $TARGETFLAGS")

1 0

Zebediah Figura : qcap/tests: Add some tests for smart tee filter interfaces.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: c6f95af31dc59eac1f1f5bcbe0b23d78ba825fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f95af31dc59eac1f1f5bcb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:52 2019 -0500 qcap/tests: Add some tests for smart tee filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 0c79ea7..5bcb82d 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -24,6 +24,57 @@ static HANDLE event; +static IBaseFilter *create_smart_tee(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_SmartTee, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +#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) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + 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_interfaces(void) +{ + IBaseFilter *filter = create_smart_tee(); + ULONG ref; + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got unexpected refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -2016,6 +2067,8 @@ START_TEST(smartteefilter) event = CreateEventW(NULL, FALSE, FALSE, NULL); + test_interfaces(); + test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_uninit_gdi().
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 15d52fec683bf79c37b37b82498d127c09cf1ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=15d52fec683bf79c37b37b82… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:45 2019 +0430 wined3d: Get rid of wined3d_device_uninit_gdi(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 27 ++++++--------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f4aabf4..cb7c12a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -400,7 +400,7 @@ static void ddraw_destroy_swapchain(struct ddraw *ddraw) } else { - wined3d_device_uninit_gdi(ddraw->wined3d_device); + wined3d_device_uninit_3d(ddraw->wined3d_device); } ddraw_set_swapchain_window(ddraw, NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1424ed4..a0c44b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1174,11 +1174,12 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { + BOOL no3d = device->wined3d->flags & WINED3D_NO3D; unsigned int i; TRACE("device %p.\n", device); - if (!device->d3d_initialized) + if (!device->d3d_initialized && !no3d) return WINED3DERR_INVALIDCALL; wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); @@ -1192,7 +1193,10 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); - wined3d_device_delete_opengl_contexts(device); + if (no3d) + device->blitter->ops->blitter_destroy(device->blitter, NULL); + else + wined3d_device_delete_opengl_contexts(device); if (device->fb.depth_stencil) { @@ -1239,25 +1243,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) return WINED3D_OK; } -HRESULT CDECL wined3d_device_uninit_gdi(struct wined3d_device *device) -{ - unsigned int i; - - device->blitter->ops->blitter_destroy(device->blitter, NULL); - - for (i = 0; i < device->swapchain_count; ++i) - { - TRACE("Releasing the implicit swapchain %u.\n", i); - if (wined3d_swapchain_decref(device->swapchains[i])) - FIXME("Something's still holding the implicit swapchain.\n"); - } - - heap_free(device->swapchains); - device->swapchains = NULL; - device->swapchain_count = 0; - return WINED3D_OK; -} - /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw * from SetCooperativeLevel if DDSCL_MULTITHREADED is specified, and by d3d8/9 from * CreateDevice if D3DCREATE_MULTITHREADED is passed. diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1422c65..704e19d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -189,7 +189,6 @@ @ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_uninit_3d(ptr) -@ cdecl wined3d_device_uninit_gdi(ptr) @ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long long) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e943e0d..8a29ef6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2481,7 +2481,6 @@ void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT i void __cdecl wined3d_device_setup_fullscreen_window(struct wined3d_device *device, HWND window, UINT w, UINT h); BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show); HRESULT __cdecl wined3d_device_uninit_3d(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_uninit_gdi(struct wined3d_device *device); void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags);

1 0

Tag wine-4.6 : Alexandre Julliard : Release 4.6
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: refs/tags/wine-4.6 Tag: f646bc60caba909f6916809c24e6637f0a1ee61a URL: https://source.winehq.org/git/wine.git/?a=tag;h=f646bc60caba909f6916809c24e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:10:12 2019 +0200 Release 4.6

1 0

Alexandre Julliard : Release 4.6.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: fabde842ede40fc53cf6f5743d5b477841f7b11c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fabde842ede40fc53cf6f574… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:10:12 2019 +0200 Release 4.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 995 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 516 insertions(+), 501 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fabde842ede40fc53cf6…

1 0

Alexandre Julliard : sfnt2fon: Avoid using wine/unicode.h on Windows.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 3c29cc446bfbe69dd17dcab2061677f5a63af741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c29cc446bfbe69dd17dcab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 13:29:49 2019 +0200 sfnt2fon: Avoid using wine/unicode.h on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/sfnt2fon.c | 64 ++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 25f0763..9dfc178 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -41,7 +41,8 @@ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H -#include "wine/unicode.h" +#include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "basetsd.h" @@ -340,15 +341,40 @@ static int lookup_charset(int enc) return OEM_CHARSET; } -static int get_char(const union cptable *cptable, int enc, int index) +#ifdef _WIN32 + +static void get_char_table(int enc, WCHAR tableW[0x100]) { - /* Korean has the Won sign in place of '\\' */ - if(enc == 949 && index == '\\') - return 0x20a9; + int i; + char tableA[0x100]; - return cptable->sbcs.cp2uni[index]; + if (!GetCPInfo( enc, &info )) error("Can't find codepage %d\n", enc); + if (info.MaxCharSize > 1) enc = 1252; + + for (i = 0; i < 0x100; i++) tableA[i] = i; + MultiByteToWideChar( enc, 0, tableA, 0x100, tableW, 0x100 ); } +#else /* _WIN32 */ + +#include "wine/unicode.h" + +static void get_char_table(int enc, WCHAR tableW[0x100]) +{ + int i; + char tableA[0x100]; + const union cptable *cptable = wine_cp_get_table(enc); + + if (!cptable) error("Can't find codepage %d\n", enc); + /* for double byte charsets we actually want to use cp1252 */ + if (cptable->info.char_size != 1) cptable = wine_cp_get_table(1252); + + for (i = 0; i < 0x100; i++) tableA[i] = i; + wine_cp_mbstowcs( cptable, 0, tableA, 0x100, tableW, 0x100 ); +} + +#endif /* _WIN32 */ + static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int dpi, unsigned char def_char, int avg_width ) { @@ -359,7 +385,6 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int i, x, y, x_off, x_end, first_char; FT_UInt gi; int num_names; - const union cptable *cptable; FT_SfntName sfntname; TT_OS2 *os2; FT_ULong needed; @@ -368,22 +393,17 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int num_sizes; struct fontinfo *info; size_t data_pos; + WCHAR table[0x100]; if (FT_New_Face(ft_library, face_name, 0, &face)) error( "Cannot open face %s\n", face_name ); if (FT_Set_Pixel_Sizes(face, ppem, ppem)) error( "cannot set face size to %u\n", ppem ); - cptable = wine_cp_get_table(enc); - if(!cptable) - error("Can't find codepage %d\n", enc); + assert( face->size->metrics.y_ppem == ppem ); - if(cptable->info.char_size != 1) { - /* for double byte charsets we actually want to use cp1252 */ - cptable = wine_cp_get_table(1252); - if(!cptable) - error("Can't find codepage 1252\n"); - } + get_char_table( enc, table ); - assert( face->size->metrics.y_ppem == ppem ); + /* Korean has the Won sign in place of '\\' */ + if (enc == 949) table['\\'] = 0x20a9; needed = 0; if (FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, NULL, &needed)) @@ -462,12 +482,11 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, os2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); for(i = first_char; i < 0x100; i++) { - int c = get_char(cptable, enc, i); - gi = FT_Get_Char_Index(face, c); + gi = FT_Get_Char_Index(face, table[i]); if(gi == 0 && !option_quiet) fprintf(stderr, "warning: %s %u: missing glyph for char %04x\n", - face->family_name, ppem, cptable->sbcs.cp2uni[i]); - if(FT_Load_Char(face, c, FT_LOAD_DEFAULT)) { + face->family_name, ppem, table[i]); + if(FT_Load_Char(face, table[i], FT_LOAD_DEFAULT)) { fprintf(stderr, "error loading char %d - bad news!\n", i); continue; } @@ -546,8 +565,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, data_pos = 0; for(i = first_char; i < 0x100; i++) { - int c = get_char(cptable, enc, i); - if(FT_Load_Char(face, c, FT_LOAD_DEFAULT)) { + if(FT_Load_Char(face, table[i], FT_LOAD_DEFAULT)) { continue; } assert(info->dfCharTable[i].width == face->glyph->metrics.horiAdvance >> 6);

1 0

Alexandre Julliard : wrc: Avoid using wine/unicode.h on Windows.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: ab6e4c8b735aa28112fbc6ec876d8881ef6498f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6e4c8b735aa28112fbc6ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 12:59:59 2019 +0200 wrc: Avoid using wine/unicode.h on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/parser.l | 2 +- tools/wrc/parser.y | 46 ++++++++++++++++++++---------------- tools/wrc/po.c | 37 +++++++++++++---------------- tools/wrc/utils.c | 67 ++++++++++++++++++++++++++++++++++++++-------------- tools/wrc/utils.h | 1 + tools/wrc/wrc.h | 1 - tools/wrc/wrctypes.h | 3 --- 7 files changed, 94 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab6e4c8b735aa28112fb…

1 0

Alexandre Julliard : wmc: Avoid using wine/unicode.h on Windows.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: cd372015174205555eb6819b3828c39928795574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd372015174205555eb6819b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 12:14:59 2019 +0200 wmc: Avoid using wine/unicode.h on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- tools/wmc/lang.h | 6 ++++-- tools/wmc/mcl.c | 9 ++------- tools/wmc/mcy.y | 4 ++-- tools/wmc/po.c | 6 +++--- tools/wmc/write.c | 29 +++++------------------------ 6 files changed, 68 insertions(+), 41 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index 07022f7..99a27cf 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -168,7 +168,7 @@ void show_languages(void) printf(" Code | DOS-cp | WIN-cp | Language | Country\n"); printf("-------+--------+--------+--------------+---------\n"); for(i = 0; i < ARRAY_SIZE(languages); i++) - printf("0x%04x | %5d | %5d | %-12s | %s\n", + printf("0x%04x | %5d | %5d | %-12s | %s\n", languages[i].id, languages[i].doscp, languages[i].wincp, @@ -187,6 +187,41 @@ const language_t *find_language(unsigned id) sizeof(languages[0]), langcmp); } +#ifdef _WIN32 + +static BOOL CALLBACK proc( char *cp ) +{ + CPINFOEXA info; + GetCPInfoExA( atoi(cp), 0, &info ); + printf("%-5s %s\n", cp, info.CodePageName ); + return TRUE; +} + +void show_codepages(void) +{ + printf("Codepages:\n"); + EnumSystemCodePagesA( proc, 0 ); +} + +int is_valid_codepage(int id) +{ + return IsValidCodePage( id ); +} + +int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +{ + return MultiByteToWideChar( codepage, flags, src, srclen, dst, dstlen ); +} + +int wmc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +{ + return WideCharToMultiByte( codepage, flags, src, srclen, dst, dstlen, NULL, NULL ); +} + +#else /* _WIN32 */ + +#include "wine/unicode.h" + void show_codepages(void) { unsigned i; @@ -198,7 +233,21 @@ void show_codepages(void) } } -const union cptable *find_codepage(int id) +int is_valid_codepage(int id) { - return wine_cp_get_table(id); + return id == CP_UTF8 || wine_cp_get_table(id); } + +int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +{ + if (codepage == CP_UTF8) return wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); + return wine_cp_mbstowcs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen ); +} + +int wmc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +{ + if (codepage == CP_UTF8) return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); + return wine_cp_wcstombs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen, NULL, NULL ); +} + +#endif /* _WIN32 */ diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index 5a11c5b..660995b 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -21,7 +21,7 @@ #ifndef __WMC_LANG_H #define __WMC_LANG_H -#include "wine/unicode.h" +#include "winnls.h" typedef struct language { unsigned id; @@ -34,6 +34,8 @@ typedef struct language { void show_languages(void); const language_t *find_language(unsigned id); void show_codepages(void); -const union cptable *find_codepage(int id); +int is_valid_codepage(int id); +int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); +int wmc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); #endif diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 0a57e2b..68d2444 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -149,13 +149,11 @@ static int isisochar(int ch) } static int codepage; -static const union cptable *codepage_def; void set_codepage(int cp) { codepage = cp; - codepage_def = find_codepage(codepage); - if(!codepage_def && codepage != CP_UTF8) + if (!is_valid_codepage( cp )) xyyerror("Codepage %d not found; cannot process\n", codepage); } @@ -200,10 +198,7 @@ try_again: xyyerror(err_fatalread); else if(!cptr) return 0; - if (codepage_def) - n = wine_cp_mbstowcs(codepage_def, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); - else - n = wine_utf8_mbstowcs(0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); + n = wmc_mbstowcs(codepage, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); if(n < 0) internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)\n", n); if(n <= 1) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 54403d5..f1d3458 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -254,9 +254,9 @@ cmap : clan '=' tNUMBER ':' tNUMBER { static const char err_nocp[] = "Codepage %d not builtin; cannot convert\n"; if(find_cpxlat($1)) xyyerror("Codepage translation already defined for language 0x%x\n", $1); - if($3 && $3 != CP_UTF8 && !find_codepage($3)) + if($3 && !is_valid_codepage($3)) xyyerror(err_nocp, $3); - if($5 && $5 != CP_UTF8 && !find_codepage($5)) + if($5 && !is_valid_codepage($5)) xyyerror(err_nocp, $5); add_cpxlat($1, $3, $5); } diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 6986bc9..8a8064a 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -405,7 +405,7 @@ static char *get_message_context( char **msgid ) static char *convert_string_utf8( const lanmsg_t *msg ) { char *buffer = xmalloc( msg->len * 4 + 1 ); - int len = wine_utf8_wcstombs( 0, msg->msg, msg->len, buffer, msg->len * 4 ); + int len = wmc_wcstombs( CP_UTF8, 0, msg->msg, msg->len, buffer, msg->len * 4 ); buffer[len] = 0; return buffer; } @@ -656,9 +656,9 @@ static lanmsg_t *translate_string( lanmsg_t *str, int lang, int *found ) new->cp = 0; /* FIXME */ new->file = str->file; new->line = str->line; - new->len = wine_utf8_mbstowcs( 0, transl, strlen(transl) + 1, NULL, 0 ); + new->len = wmc_mbstowcs( CP_UTF8, 0, transl, strlen(transl) + 1, NULL, 0 ); new->msg = xmalloc( new->len * sizeof(WCHAR) ); - res = wine_utf8_mbstowcs( MB_ERR_INVALID_CHARS, transl, strlen(transl) + 1, new->msg, new->len ); + res = wmc_mbstowcs( CP_UTF8, MB_ERR_INVALID_CHARS, transl, strlen(transl) + 1, new->msg, new->len ); if (res == -2) error( "Invalid utf-8 character in string '%s'\n", transl ); free( buffer ); diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 19cd5b3..59cb869 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -98,17 +98,11 @@ static char *dup_u2c(int cp, const WCHAR *uc) { int len; char *cptr; - const union cptable *cpdef = find_codepage(cp); - if(cpdef) - len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); - else - len = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); + if (!cp) cp = CP_UTF8; + len = wmc_wcstombs(cp, 0, uc, unistrlen(uc)+1, NULL, 0); cptr = xmalloc(len); - if (cpdef) - len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, cptr, len, NULL, NULL); - else - len = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, cptr, len); + len = wmc_wcstombs(cp, 0, uc, unistrlen(uc)+1, cptr, len); if (len < 0) internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", len); return cptr; @@ -385,21 +379,8 @@ static char *make_string(WCHAR *uc, int len, int codepage) else { char *tmp, *cc; - int mlen; - const union cptable *cpdef = find_codepage(codepage); - - if (cpdef) - mlen = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); - else - mlen = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); - cc = tmp = xmalloc(mlen); - if (cpdef) { - if((i = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, tmp, mlen, NULL, NULL)) < 0) - internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); - } else { - if((i = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, tmp, mlen)) < 0) - internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); - } + + cc = tmp = dup_u2c(codepage, uc); *cptr++ = ' '; *cptr++ = '"'; for(i = b = 0; i < len; i++, cc++)

1 0

Zebediah Figura : qcap/tests: Add more tests for smart tee pin interfaces.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 7ca60b90ef0114149f240270f4c592503464087c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca60b90ef0114149f240270… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:56 2019 -0500 qcap/tests: Add more tests for smart tee pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 88 ++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 39 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 79d296d..b3b0584 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -63,6 +63,7 @@ static void test_interfaces(void) { IBaseFilter *filter = create_smart_tee(); ULONG ref; + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -82,6 +83,54 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAMStreamConfig, FALSE); + check_interface(pin, &IID_IAMStreamControl, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IPropertyBag, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, capture_id, &pin); + + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAMStreamConfig, FALSE); + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IPropertyBag, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, preview_id, &pin); + + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAMStreamConfig, FALSE); + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IPropertyBag, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); ok(!ref, "Got unexpected refcount %d.\n", ref); } @@ -1842,21 +1891,6 @@ static SourceFilter* create_audio_SourceFilter(void) return This; } -static BOOL has_interface(IUnknown *unknown, REFIID uuid) -{ - HRESULT hr; - IUnknown *iface = NULL; - - hr = IUnknown_QueryInterface(unknown, uuid, (void**)&iface); - if (SUCCEEDED(hr)) - { - IUnknown_Release(iface); - return TRUE; - } - else - return FALSE; -} - static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *inputPin, IPin *capturePin, IPin *previewPin) { @@ -2036,30 +2070,6 @@ static void test_smart_tee_filter(void) if (!(inputPin && capturePin && previewPin)) goto end; - ok(has_interface((IUnknown*)inputPin, &IID_IUnknown), "IUnknown should exist on the input pin\n"); - ok(has_interface((IUnknown*)inputPin, &IID_IMemInputPin), "IMemInputPin should exist the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IKsPropertySet), "IKsPropertySet shouldn't exist on the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IAMStreamConfig), "IAMStreamConfig shouldn't exist on the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IAMStreamControl), "IAMStreamControl shouldn't exist on the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IPropertyBag), "IPropertyBag shouldn't exist on the input pin\n"); - todo_wine ok(has_interface((IUnknown*)inputPin, &IID_IQualityControl), "IQualityControl should exist on the input pin\n"); - - ok(has_interface((IUnknown*)capturePin, &IID_IUnknown), "IUnknown should exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IAsyncReader), "IAsyncReader shouldn't exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IKsPropertySet), "IKsPropertySet shouldn't exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IAMStreamConfig), "IAMStreamConfig shouldn't exist on the capture pin\n"); - todo_wine ok(has_interface((IUnknown*)capturePin, &IID_IAMStreamControl), "IAMStreamControl should exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IPropertyBag), "IPropertyBag shouldn't exist on the capture pin\n"); - todo_wine ok(has_interface((IUnknown*)capturePin, &IID_IQualityControl), "IQualityControl should exist on the capture pin\n"); - - ok(has_interface((IUnknown*)previewPin, &IID_IUnknown), "IUnknown should exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IAsyncReader), "IAsyncReader shouldn't exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IKsPropertySet), "IKsPropertySet shouldn't exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IAMStreamConfig), "IAMStreamConfig shouldn't exist on the preview pin\n"); - todo_wine ok(has_interface((IUnknown*)capturePin, &IID_IAMStreamControl), "IAMStreamControl should exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IPropertyBag), "IPropertyBag shouldn't exist on the preview pin\n"); - todo_wine ok(has_interface((IUnknown*)previewPin, &IID_IQualityControl), "IQualityControl should exist on the preview pin\n"); - hr = IPin_QueryInterface(inputPin, &IID_IMemInputPin, (void**)&memInputPin); ok(SUCCEEDED(hr), "couldn't get mem input pin, hr=0x%08x\n", hr); if (FAILED(hr))

1 0

Zebediah Figura : qcap/tests: Add some tests for IBaseFilter::FindPin() on the smart tee filter.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 4862f8404b13e9509b203da31a47c093eb38617d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4862f8404b13e9509b203da3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:54 2019 -0500 qcap/tests: Add some tests for IBaseFilter::FindPin() on the smart tee filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index cdd09f0..f931d0b 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -22,6 +22,10 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'I','n','p','u','t',0}; +static const WCHAR capture_id[] = {'C','a','p','t','u','r','e',0}; +static const WCHAR preview_id[] = {'P','r','e','v','i','e','w',0}; + static HANDLE event; static IBaseFilter *create_smart_tee(void) @@ -222,6 +226,46 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + IBaseFilter *filter = create_smart_tee(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + 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(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, capture_id, &pin); + 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(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, preview_id, &pin); + 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(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -2216,6 +2260,7 @@ START_TEST(smartteefilter) test_interfaces(); test_enum_pins(); + test_find_pin(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Zebediah Figura : qcap/tests: Add some more tests for IBaseFilter:: EnumPins() on the smart tee filter.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: ea1c56cb6672c13211fdbca39956c18bd873b3b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea1c56cb6672c13211fdbca3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:53 2019 -0500 qcap/tests: Add some more tests for IBaseFilter::EnumPins() on the smart tee filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 148 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 5bcb82d..cdd09f0 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -33,6 +33,13 @@ static IBaseFilter *create_smart_tee(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,146 @@ static void test_interfaces(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_smart_tee(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[4]; + HRESULT hr; + + 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); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + 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_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + 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_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + 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_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_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_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + 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_Next(enum1, 4, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + IPin_Release(pins[2]); + + 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, 4); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 3); + 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); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -2068,6 +2215,7 @@ START_TEST(smartteefilter) event = CreateEventW(NULL, FALSE, FALSE, NULL); test_interfaces(); + test_enum_pins(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Jacek Caban : ntoskrnl.exe: Open thread with THREAD_QUERY_INFORMATION access in KeGetCurrentThread.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 2017db7d0af4421357ad58fee880f6eeb162e4f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2017db7d0af4421357ad58fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 12 15:20:28 2019 +0200 ntoskrnl.exe: Open thread with THREAD_QUERY_INFORMATION access in KeGetCurrentThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 861eb40..3789abd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2510,7 +2510,8 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) HANDLE handle = GetCurrentThread(); /* FIXME: we shouldn't need it, GetCurrentThread() should be client thread already */ - if (GetCurrentThreadId() == request_thread) handle = OpenThread( 0, FALSE, client_tid ); + if (GetCurrentThreadId() == request_thread) + handle = OpenThread( THREAD_QUERY_INFORMATION, FALSE, client_tid ); kernel_object_from_handle( handle, PsThreadType, (void**)&thread ); if (handle != GetCurrentThread()) NtClose( handle );

1 0

Henri Verbeet : dxgi: Slightly simplify d3d11_swapchain_init().
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 7d351e1168b4f41ca43e67f3b038abaecbefa6b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d351e1168b4f41ca43e67f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:48 2019 +0430 dxgi: Slightly simplify d3d11_swapchain_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 4 ++-- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 12 +++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index d6dd041..e3dc52b 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -474,7 +474,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX return E_OUTOFMEMORY; } - if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc, FALSE))) + if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc))) { WARN("Failed to initialise swapchain, hr %#x.\n", hr); heap_free(object); @@ -578,7 +578,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return E_OUTOFMEMORY; } - if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc, TRUE))) + if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); heap_free(swapchain); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5c5775c..b6999c7 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -178,7 +178,7 @@ struct d3d11_swapchain }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; + struct wined3d_swapchain_desc *desc) DECLSPEC_HIDDEN; HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 17f9a1e..53da208 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -779,16 +779,14 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc, BOOL implicit) + struct wined3d_swapchain_desc *desc) { HRESULT hr; - /* - * A reference to the implicit swapchain is held by the wined3d device. - * In order to avoid circular references we do not keep a reference - * to the device in the implicit swapchain. - */ - if (!implicit) + /* A reference to the implicit swapchain is held by the wined3d device. In + * order to avoid circular references we do not keep a reference to the + * device in the implicit swapchain. */ + if (!(desc->flags & WINED3D_SWAPCHAIN_IMPLICIT)) { if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) return E_INVALIDARG;

1 0

Henri Verbeet : ddraw: Simplify ddraw_destroy_swapchain().
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: f485816d102e517bc092934348ec9cddf624696b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f485816d102e517bc0929343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:46 2019 +0430 ddraw: Simplify ddraw_destroy_swapchain(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cb7c12a..b209772 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -365,44 +365,34 @@ static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) static void ddraw_destroy_swapchain(struct ddraw *ddraw) { + unsigned int i; + HRESULT hr; + TRACE("Destroying the swapchain.\n"); wined3d_swapchain_decref(ddraw->wined3d_swapchain); ddraw->wined3d_swapchain = NULL; - if (!(ddraw->flags & DDRAW_NO3D)) + for (i = 0; i < ddraw->numConvertedDecls; ++i) { - UINT i; + wined3d_vertex_declaration_decref(ddraw->decls[i].decl); + } + heap_free(ddraw->decls); + ddraw->numConvertedDecls = 0; - for (i = 0; i < ddraw->numConvertedDecls; ++i) - { - wined3d_vertex_declaration_decref(ddraw->decls[i].decl); - } - heap_free(ddraw->decls); - ddraw->numConvertedDecls = 0; + if (FAILED(hr = wined3d_device_uninit_3d(ddraw->wined3d_device))) + ERR("Failed to uninit 3D, hr %#x.\n", hr); - if (FAILED(wined3d_device_uninit_3d(ddraw->wined3d_device))) - { - ERR("Failed to uninit 3D.\n"); - } - else - { - /* Free the d3d window if one was created. */ - if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) - { - TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); - DestroyWindow(ddraw->d3d_window); - ddraw->d3d_window = 0; - } - } - - ddraw->flags &= ~DDRAW_D3D_INITIALIZED; - } - else + /* Free the d3d window if one was created. */ + if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) { - wined3d_device_uninit_3d(ddraw->wined3d_device); + TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); + DestroyWindow(ddraw->d3d_window); + ddraw->d3d_window = 0; } + ddraw->flags &= ~DDRAW_D3D_INITIALIZED; + ddraw_set_swapchain_window(ddraw, NULL); TRACE("Swapchain destroyed.\n");

1 0