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

[PATCH] d3d9: Fix memory leak in device_init() (Coverity).
by Józef Kucia 15 Apr '19

15 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 999969119e36..bef01a477f9b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4547,6 +4547,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_swapchain_decref(d3d_swapchain->wined3d_swapchain); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); + heap_free(swapchain_desc); wined3d_mutex_unlock(); return E_OUTOFMEMORY; } -- 2.21.0

2 1

[PATCH] dwrite/layout: Fix invalid index access to cluster array.
by Nikolay Sivov 15 Apr '19

15 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45543 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4cd5ce445f..d101a5a197 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1853,6 +1853,9 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust metrics.trailingWhitespaceLength += cluster->length; trailingspacewidth += cluster->width; + + if (index == 0) + break; } /* Line metrics length includes trailing whitespace length too */ -- 2.20.1

1 0

[PATCH vkd3d 2/2] build: Print widl in configuration summary.
by Józef Kucia 15 Apr '19

15 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 28f2ac908733..02f9028ee6a7 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} -- 2.21.0

3 2

[PATCH vkd3d 1/2] build: Redirect stderr to /dev/null in VKD3D_PROG_WIDL.
by Józef Kucia 15 Apr '19

15 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- m4/widl.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/widl.m4 b/m4/widl.m4 index 2849356f7c04..6d226064f0a9 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)])], -- 2.21.0

2 1

[PATCH vkd3d 1/5] build: Add linker scripts to EXTRA_*_DEPENDENCIES.
by Józef Kucia 15 Apr '19

15 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2b5bca0871c6..299ec2603b46 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 -- 2.21.0

2 1

[PATCH 3/4] mshtml: Support argument type conversion for functions with dual interface arguments.
by Jacek Caban 15 Apr '19

15 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-)

1 0

[PATCH 2/4] mshtml: Support argument type conversion for functions with IDispatch arguments.
by Jacek Caban 15 Apr '19

15 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/4] mshtml: Support type conversion in functions with arguments using default values.
by Jacek Caban 15 Apr '19

15 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-)

1 0

Can't cross-compile WineD3D anymore
by dosse91 15 Apr '19

15 Apr '19

Since version 4.6, when the requirement for libwine.dll was removed, I am unable to build Wine. When I try to build dlls/wined3d, it fails saying "No rule to make target '../../libs/port/libwine_port.a', needed by 'wined3d.dll'". The same thing happens when I try to build ddraw, d3d8, etc. What am I doing wrong? Thank you

2 1

[PATCH] riched20: Handle tomEnd in ITextRange::ScrollIntoView.
by Gijs Vermeulen 15 Apr '19

15 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46899 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/riched20/richole.c | 4 ++++ dlls/riched20/tests/richole.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 93003eb281..4b47310a8e 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2485,6 +2485,10 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) ME_CursorFromCharOfs(editor, This->start, &cursor); ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); break; + case tomEnd: + ME_CursorFromCharOfs(editor, This->end, &cursor); + ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + break; default: FIXME("bStart value %d not handled\n", value); return E_NOTIMPL; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d9c7fa1670..40feb76f2b 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -853,15 +853,19 @@ static void test_ITextRange_ScrollIntoView(void) /* Scroll to the top. */ check_range(w, txtDoc, 0, 1, tomStart, 0); + check_range(w, txtDoc, 0, 1, tomEnd, 0); /* Scroll to the bottom. */ check_range(w, txtDoc, 19, 20, tomStart, 1); + check_range(w, txtDoc, 19, 20, tomEnd, 1); /* Back up to the top. */ check_range(w, txtDoc, 0, 1, tomStart, 0); + check_range(w, txtDoc, 0, 1, tomEnd, 0); /* Large range */ check_range(w, txtDoc, 0, 20, tomStart, 0); + check_range(w, txtDoc, 0, 20, tomEnd, 1); hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); -- 2.21.0

2 1