July 2017 - Wine-Commits - list.winehq.org

Piotr Caban : gdiplus: Fix saving pen dashed line cap style to metafile.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 70afb4ecd0a947841fadb3c17785c4d763479b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70afb4ecd0a947841fadb3c17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 24 16:54:06 2017 +0200 gdiplus: Fix saving pen dashed line cap style to metafile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c3895ed..063e565 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2791,7 +2791,7 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i data_flags |= PenDataLineStyle; pen_data_size += sizeof(DWORD); } - if (pen->dash != (GpDashStyle)DashCapFlat) + if (pen->dashcap != DashCapFlat) { data_flags |= PenDataDashedLineCap; pen_data_size += sizeof(DWORD); @@ -2879,7 +2879,7 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i } if (data_flags & PenDataDashedLineCap) { - *(DWORD*)(pen_data->OptionalData + i) = pen->dash; + *(DWORD*)(pen_data->OptionalData + i) = pen->dashcap; i += sizeof(DWORD); } if (data_flags & PenDataDashedLineOffset)

1 0

Marcus Meissner : gdiplus: Free dash_pattern_scaled (Coverity).
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: a172cc6c6ea8f627e3c92c4c53639b8cf7c8ab84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a172cc6c6ea8f627e3c92c4c5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jul 23 22:25:19 2017 +0200 gdiplus: Free dash_pattern_scaled (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 05c7982..8b13fc5 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2109,7 +2109,10 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, dash_pattern_scaled[i] = pen->width * dash_pattern[i]; tmp_points = heap_alloc_zero((end - start + 2) * sizeof(GpPoint)); - if (!tmp_points) return; /* FIXME */ + if (!tmp_points) { + heap_free(dash_pattern_scaled); + return; /* FIXME */ + } if (!closed) draw_start_cap = 1;

1 0

Piotr Caban : gdiplus: Return success saving path to metafile.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 21763489982177f4db9e5f8cc8ccb751441f5a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=21763489982177f4db9e5f8cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 24 16:54:11 2017 +0200 gdiplus: Return success saving path to metafile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 2 +- dlls/gdiplus/tests/metafile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 063e565..99e5483 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2937,7 +2937,7 @@ GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) draw_path_record->PenId = pen_id; METAFILE_WriteRecords(metafile); - return NotImplemented; + return Ok; } static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GpBrush *brush, DWORD *id) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index aa32276..3b6bced 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2651,7 +2651,7 @@ static void test_drawpath(void) expect(Ok, stat); stat = GdipDrawPath(graphics, pen, path); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipDeletePen(pen); expect(Ok, stat);

1 0

Nikolay Sivov : windowscodecs/tests: Fix a leak in tests (Valgrind).
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: bf3b3312fee633fdb9138bfd6884e4849f40aac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3b3312fee633fdb9138bfd6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 23 14:54:35 2017 +0300 windowscodecs/tests: Fix a leak in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index f0cfc09..e106a08 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1750,6 +1750,7 @@ static void test_metadata_gif(void) hr = IWICMetadataQueryReader_GetMetadataByName(queryreader, queryW, &value); ok(hr == S_OK, "GetMetadataByName(%s) error %#x\n", wine_dbgstr_w(queryW), hr); ok(value.vt == VT_UNKNOWN, "expected VT_UNKNOWN, got %#x\n", value.vt); + PropVariantClear(&value); IWICMetadataQueryReader_Release(queryreader); }

1 0

André Hentschel : ntdll: Make sure the stack is quad-word aligned on ARM64.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 2e9611bbd0654d74f08f2ad154e457f48b54f6f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e9611bbd0654d74f08f2ad15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 24 18:38:48 2017 +0200 ntdll: Make sure the stack is quad-word aligned on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 3a51567..4b305e3 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -386,8 +386,8 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun } *stack; DWORD exception_code = 0; - stack = (struct stack_layout *)(SP_sig(sigcontext) & ~15); - stack--; /* push the stack_layout structure */ + /* push the stack_layout structure */ + stack = (struct stack_layout *)((SP_sig(sigcontext) - sizeof(*stack)) & ~15); stack->rec.ExceptionRecord = NULL; stack->rec.ExceptionCode = exception_code;

1 0

Alexandre Julliard : configure: Allow specifying custom CFLAGS for LDAP.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: ae3adacdde6202150efc6fb2dd1a49160ac30723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3adacdde6202150efc6fb2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 18:27:17 2017 +0200 configure: Allow specifying custom CFLAGS for LDAP. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 82 +++++++++++++++++++++++++++++++++++++----------- configure.ac | 51 ++++++++++++++++-------------- dlls/wldap32/Makefile.in | 1 + 3 files changed, 92 insertions(+), 42 deletions(-) diff --git a/configure b/configure index 296be63..0c670fe 100755 --- a/configure +++ b/configure @@ -627,6 +627,7 @@ LIBOBJS WINELOADER_INSTALL ALL_VARS_RULES LDAP_LIBS +LDAP_CFLAGS RT_LIBS POLL_LIBS DL_LIBS @@ -1705,7 +1706,9 @@ TIFF_LIBS MPG123_CFLAGS MPG123_LIBS NETAPI_CFLAGS -NETAPI_LIBS' +NETAPI_LIBS +LDAP_CFLAGS +LDAP_LIBS' # Initialize some variables set by options. @@ -2467,6 +2470,8 @@ Some influential environment variables: NETAPI_CFLAGS C compiler flags for netapi, overriding pkg-config NETAPI_LIBS Linker flags for netapi, overriding pkg-config + LDAP_CFLAGS C compiler flags for openldap, overriding pkg-config + LDAP_LIBS Linker flags for openldap, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -6871,8 +6876,6 @@ for ac_header in \ inet/mib2.h \ io.h \ kstat.h \ - lber.h \ - ldap.h \ libproc.h \ link.h \ linux/cdrom.h \ @@ -15952,11 +15955,41 @@ fi LIBS=$ac_save_LIBS -LDAP_LIBS="" - -if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" +if test "x$with_ldap" != "xno" then - ac_fn_c_check_type "$LINENO" "LDAPSortKey" "ac_cv_type_LDAPSortKey" "#include <ldap.h> + if ${LDAP_CFLAGS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + LDAP_CFLAGS=`$PKG_CONFIG --cflags openldap 2>/dev/null` +fi +fi + +if ${LDAP_LIBS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + LDAP_LIBS=`$PKG_CONFIG --libs openldap 2>/dev/null` +fi +fi + +LDAP_LIBS=${LDAP_LIBS:-"-lldap_r -llber"} +$as_echo "$as_me:${as_lineno-$LINENO}: openldap cflags: $LDAP_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: openldap libs: $LDAP_LIBS" >&5 +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS" +for ac_header in ldap.h lber.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" + then + ac_fn_c_check_type "$LINENO" "LDAPSortKey" "ac_cv_type_LDAPSortKey" "#include <ldap.h> " if test "x$ac_cv_type_LDAPSortKey" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap_r" >&5 @@ -15965,7 +15998,7 @@ if ${ac_cv_lib_ldap_r_ldap_initialize+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap_r $PTHREAD_LIBS $LIBS" +LIBS="-lldap_r $PTHREAD_LIBS $LDAP_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16002,7 +16035,7 @@ if ${ac_cv_lib_lber_ber_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llber $PTHREAD_LIBS $LIBS" +LIBS="-llber $PTHREAD_LIBS $LDAP_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16036,24 +16069,29 @@ if test "x$ac_cv_lib_lber_ber_init" = xyes; then : $as_echo "#define HAVE_LDAP 1" >>confdefs.h - LDAP_LIBS="-lldap_r -llber" +else + LDAP_LIBS="" fi +else + LDAP_LIBS="" fi +else + LDAP_LIBS="" fi - ac_wine_check_funcs_save_LIBS="$LIBS" + ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $LDAP_LIBS $PTHREAD_LIBS" for ac_func in \ - ldap_count_references \ - ldap_first_reference \ - ldap_next_reference \ - ldap_parse_reference \ - ldap_parse_sort_control \ - ldap_parse_sortresponse_control \ - ldap_parse_vlv_control \ - ldap_parse_vlvresponse_control + ldap_count_references \ + ldap_first_reference \ + ldap_next_reference \ + ldap_parse_reference \ + ldap_parse_sort_control \ + ldap_parse_sortresponse_control \ + ldap_parse_vlv_control \ + ldap_parse_vlvresponse_control do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -16066,6 +16104,11 @@ fi done LIBS="$ac_wine_check_funcs_save_LIBS" + fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$LDAP_CFLAGS" || LDAP_CFLAGS=`echo " $LDAP_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$LDAP_LIBS" || LDAP_LIBS=`echo " $LDAP_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$LDAP_LIBS" = "x"; then : case "x$with_ldap" in @@ -17853,6 +17896,7 @@ EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS DL_LIBS = $DL_LIBS POLL_LIBS = $POLL_LIBS RT_LIBS = $RT_LIBS +LDAP_CFLAGS = $LDAP_CFLAGS LDAP_LIBS = $LDAP_LIBS " diff --git a/configure.ac b/configure.ac index 533f1e4..422a7eb 100644 --- a/configure.ac +++ b/configure.ac @@ -423,8 +423,6 @@ AC_CHECK_HEADERS(\ inet/mib2.h \ io.h \ kstat.h \ - lber.h \ - ldap.h \ libproc.h \ link.h \ linux/cdrom.h \ @@ -2147,27 +2145,34 @@ AC_SEARCH_LIBS(clock_gettime, rt, LIBS=$ac_save_LIBS dnl **** Check for OpenLDAP *** -AC_SUBST(LDAP_LIBS,"") -if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" -then - AC_CHECK_TYPE(LDAPSortKey, - [AC_CHECK_LIB(ldap_r, ldap_initialize, - [AC_CHECK_LIB(lber, ber_init, - [AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment]) - LDAP_LIBS="-lldap_r -llber"],, - [$PTHREAD_LIBS])],, - [$PTHREAD_LIBS])],, - [#include <ldap.h>]) - WINE_CHECK_LIB_FUNCS(\ - ldap_count_references \ - ldap_first_reference \ - ldap_next_reference \ - ldap_parse_reference \ - ldap_parse_sort_control \ - ldap_parse_sortresponse_control \ - ldap_parse_vlv_control \ - ldap_parse_vlvresponse_control, - [$LDAP_LIBS $PTHREAD_LIBS]) +if test "x$with_ldap" != "xno" +then + dnl Actually there's no pkg-config support for ldap, but this way we can still override the flags + WINE_PACKAGE_FLAGS(LDAP,[openldap],[-lldap_r -llber],,, + [AC_CHECK_HEADERS([ldap.h lber.h]) + if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" + then + AC_CHECK_TYPE(LDAPSortKey, + [AC_CHECK_LIB(ldap_r, ldap_initialize, + [AC_CHECK_LIB(lber, ber_init, + [AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment])], + [LDAP_LIBS=""], + [$PTHREAD_LIBS $LDAP_LIBS])], + [LDAP_LIBS=""], + [$PTHREAD_LIBS $LDAP_LIBS])], + [LDAP_LIBS=""], + [#include <ldap.h>]) + WINE_CHECK_LIB_FUNCS(\ + ldap_count_references \ + ldap_first_reference \ + ldap_next_reference \ + ldap_parse_reference \ + ldap_parse_sort_control \ + ldap_parse_sortresponse_control \ + ldap_parse_vlv_control \ + ldap_parse_vlvresponse_control, + [$LDAP_LIBS $PTHREAD_LIBS]) + fi]) fi WINE_NOTICE_WITH(ldap,[test "x$LDAP_LIBS" = "x"], [libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported.]) diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index 58715fb..7dc2984 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -1,6 +1,7 @@ MODULE = wldap32.dll IMPORTLIB = wldap32 IMPORTS = user32 +EXTRAINCL = $(LDAP_CFLAGS) EXTRALIBS = $(LDAP_LIBS) C_SRCS = \

1 0

Nikolay Sivov : dwrite: Use newer enum version to avoid type mismatch ( Coverity).
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 448e9ce644ea6da994364027aad39a41ac3a0b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=448e9ce644ea6da994364027a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 24 17:26:06 2017 +0300 dwrite: Use newer enum version to avoid type mismatch (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 84921e6..22b4ca4 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -312,11 +312,11 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); IDWriteGlyphRunAnalysis *analysis; - DWRITE_RENDERING_MODE rendermode; + DWRITE_RENDERING_MODE1 rendermode; DWRITE_GRID_FIT_MODE gridfitmode; DWRITE_TEXTURE_TYPE texturetype; - IDWriteFontFace2 *fontface2; DWRITE_GLYPH_RUN scaled_run; + IDWriteFontFace3 *fontface; RECT target, bounds; HRESULT hr; @@ -331,21 +331,21 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (!params) return E_INVALIDARG; - if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace2, (void **)&fontface2))) { + if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace3, (void **)&fontface))) { WARN("Failed to get IDWriteFontFace2 interface, hr %#x.\n", hr); return hr; } - hr = IDWriteFontFace2_GetRecommendedRenderingMode(fontface2, run->fontEmSize, This->ppdip * 96.0f, + hr = IDWriteFontFace3_GetRecommendedRenderingMode(fontface, run->fontEmSize, This->ppdip * 96.0f, This->ppdip * 96.0f, NULL /* FIXME */, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, params, &rendermode, &gridfitmode); - IDWriteFontFace2_Release(fontface2); + IDWriteFontFace3_Release(fontface); if (FAILED(hr)) return hr; SetRect(&target, 0, 0, This->size.cx, This->size.cy); - if (rendermode == DWRITE_RENDERING_MODE_OUTLINE) { + if (rendermode == DWRITE_RENDERING_MODE1_OUTLINE) { static const XFORM identity = { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }; const DWRITE_MATRIX *m = &This->m; XFORM xform;

1 0

Nikolay Sivov : windowscodecs/tests: Remove unused type declarations.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 9bbbd2a9052ee44217e5e86c565f8d20acfd75f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bbbd2a9052ee44217e5e86c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 23 14:54:36 2017 +0300 windowscodecs/tests: Remove unused type declarations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index e106a08..c54d7df 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -2465,21 +2465,6 @@ struct metadata const struct metadata_block *block; }; -struct metadata_reader -{ - IWICMetadataReader IWICMetadataReader_iface; - LONG ref; - const struct metadata_block *block; -}; - -struct metadata_block_reader -{ - IWICMetadataBlockReader IWICMetadataBlockReader_iface; - LONG ref; - UINT count; - const struct metadata_block *block; -}; - static const struct metadata *current_metadata; static const struct metadata_block *current_metadata_block;

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMLanguageList interfaces in IWMReader.
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 163aac1670b9fb45061ff69f4c29efc971ee6055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163aac1670b9fb45061ff69f4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 23 00:51:36 2017 +0000 wmvcore: Support IWMLanguageList interfaces in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 6 +++++ dlls/wmvcore/wmvcore_main.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 6080a93..5bfec25 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -82,6 +82,7 @@ static void test_wmreader_interfaces(void) IWMDRMReader2 *drmreader2; IWMDRMReader3 *drmreader3; IWMReaderPlaylistBurn *playlist; + IWMLanguageList *langlist; hr = WMCreateReader( NULL, 0, &reader ); ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); @@ -151,6 +152,9 @@ static void test_wmreader_interfaces(void) hr = IWMReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); ok(hr == S_OK, "Failed 0x%08x\n", hr); + hr = IWMReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + if(packet) IWMPacketSize_Release(packet); if(packet2) @@ -185,6 +189,8 @@ static void test_wmreader_interfaces(void) IWMReaderTypeNegotiation_Release(negotiation); if(playlist) IWMReaderPlaylistBurn_Release(playlist); + if(langlist) + IWMLanguageList_Release(langlist); IWMReader_Release(reader); } diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 790aef0..9619463 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -73,6 +73,7 @@ typedef struct { IWMReaderTimecode IWMReaderTimecode_iface; IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; IWMHeaderInfo3 IWMHeaderInfo3_iface; + IWMLanguageList IWMLanguageList_iface; LONG ref; } WMReader; @@ -139,6 +140,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo3)) { TRACE("(%p)->(IWMHeaderInfo3 %p)\n", This, ppv); *ppv = &This->IWMHeaderInfo3_iface; + }else if(IsEqualGUID(riid, &IID_IWMLanguageList)) { + TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); + *ppv = &This->IWMLanguageList_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -1580,6 +1584,63 @@ static const IWMHeaderInfo3Vtbl WMHeaderInfo3Vtbl = headerinfo_AddCodecInfo }; + +static inline WMReader *impl_from_IWMLanguageList(IWMLanguageList *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMLanguageList_iface); +} + +static HRESULT WINAPI langlist_QueryInterface(IWMLanguageList *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI langlist_AddRef(IWMLanguageList *iface) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI langlist_Release(IWMLanguageList *iface) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI langlist_GetLanguageCount(IWMLanguageList *iface, WORD *count) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + FIXME("%p, %p\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI langlist_GetLanguageDetails(IWMLanguageList *iface, WORD index, + WCHAR *language, WORD *length) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + FIXME("%p, %d, %p, %p\n", This, index, language, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI langlist_AddLanguageByRFC1766String(IWMLanguageList *iface, LPCWSTR_WMSDK_TYPE_SAFE language, + WORD *index) +{ + WMReader *This = impl_from_IWMLanguageList(iface); + FIXME("%p, %p, %p\n", This, language, index); + return E_NOTIMPL; +} + +static const IWMLanguageListVtbl WMLanguageListVtbl = +{ + langlist_QueryInterface, + langlist_AddRef, + langlist_Release, + langlist_GetLanguageCount, + langlist_GetLanguageDetails, + langlist_AddLanguageByRFC1766String +}; + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { WMReader *reader; @@ -1599,6 +1660,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; reader->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl; + reader->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0

Hugh McMaster : regedit: Check for a valid subkey pointer before attempting to delete a registry key (Coverity).
by Alexandre Julliard July 24, 2017

July 24, 2017

Module: wine Branch: master Commit: 5bd636dc161ccf512996a01a9f5491382edf59f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd636dc161ccf512996a01a9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 24 12:47:56 2017 +0000 regedit: Check for a valid subkey pointer before attempting to delete a registry key (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 7be4605..7e44e37 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1125,7 +1125,7 @@ void delete_registry_key(WCHAR *reg_key_name) error_exit(STRING_INVALID_SYSTEM_KEY, reg_key_name); } - if (!*key_name) + if (!key_name || !*key_name) error_exit(STRING_DELETE_FAILED, reg_key_name); RegDeleteTreeW(key_class, key_name);

1 0