January 2021 - Wine-Commits

Zebediah Figura : gdi32: Do not compare face file names in insert_face_in_family_list() if either is NULL.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 96fdbabc722f95fd9c4051c1d6f73e5f9515afa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96fdbabc722f95fd9c4051c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 11 16:11:33 2021 -0600 gdi32: Do not compare face file names in insert_face_in_family_list() if either is NULL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50486 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7f243192cc3..6f50cc92a83 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -913,7 +913,7 @@ static BOOL insert_face_in_family_list( struct gdi_font_face *face, struct gdi_f debugstr_w(face->full_name), debugstr_w(family->family_name), cursor->version, face->version ); - if (face->file && !wcsicmp( face->file, cursor->file )) + if (face->file && cursor->file && !wcsicmp( face->file, cursor->file )) { cursor->refcount++; TRACE("Font %s already in list, refcount now %d\n",

1 0

Alistair Leslie-Hughes : msado15: Implement ADOConnectionConstruction15 get_Session.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 8af32e41c2b3301fecf27ca673e2853dae9f494e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af32e41c2b3301fecf27ca6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:15 2021 +1100 msado15: Implement ADOConnectionConstruction15 get_Session. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index c6a52e262c2..63014d7e37e 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -753,8 +753,12 @@ static HRESULT WINAPI adoconstruct_get_DSO(ADOConnectionConstruction15 *iface, I static HRESULT WINAPI adoconstruct_get_Session(ADOConnectionConstruction15 *iface, IUnknown **session) { struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); - FIXME("%p, %p\n", connection, session); - return E_NOTIMPL; + TRACE("%p, %p\n", connection, session); + + *session = connection->session; + if (*session) + IUnknown_AddRef(*session); + return S_OK; } static HRESULT WINAPI adoconstruct_WrapDSOandSession(ADOConnectionConstruction15 *iface, IUnknown *dso,

1 0

Paul Gofman : dbghelp: Fix unwind opcodes on x64.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 6bcde00566f506ffb1f7cfd9e584c793d6f4a02f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bcde00566f506ffb1f7cfd9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 15 16:06:40 2021 +0300 dbghelp: Fix unwind opcodes on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c2789d0d71b..c04d8db61cf 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -41,7 +41,8 @@ typedef enum _UNWIND_OP_CODES UWOP_SET_FPREG, UWOP_SAVE_NONVOL, UWOP_SAVE_NONVOL_FAR, - UWOP_SAVE_XMM128, + UWOP_EPILOG, + UWOP_SAVE_XMM128 = 8, UWOP_SAVE_XMM128_FAR, UWOP_PUSH_MACHFRAME } UNWIND_CODE_OPS;

1 0

Nikolay Sivov : dcomp: Add DCompositionCreateDevice() stub.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 8eabf58dee5b6212d14f425f2c32f6e42a7d8538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eabf58dee5b6212d14f425f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 14 22:45:05 2021 +0300 dcomp: Add DCompositionCreateDevice() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50459 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dcomp/dcomp.spec | 2 +- dlls/dcomp/device.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec index 10e9f49a412..428385e3a2a 100644 --- a/dlls/dcomp/dcomp.spec +++ b/dlls/dcomp/dcomp.spec @@ -15,7 +15,7 @@ @ stub DCompositionAttachMouseWheelToHwnd @ stdcall DCompositionCreateDevice2(ptr ptr ptr) @ stub DCompositionCreateDevice3 -@ stub DCompositionCreateDevice +@ stdcall DCompositionCreateDevice(ptr ptr ptr) @ stub DCompositionCreateSurfaceHandle @ stub DeserializeEffectDescription @ stub DllCanUnloadNow diff --git a/dlls/dcomp/device.c b/dlls/dcomp/device.c index efc6bacdb08..2d0600ce50a 100644 --- a/dlls/dcomp/device.c +++ b/dlls/dcomp/device.c @@ -20,10 +20,18 @@ #include "windef.h" #include "winbase.h" #include "objidl.h" +#include "dxgi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dcomp); +HRESULT WINAPI DCompositionCreateDevice(IDXGIDevice *dxgi_device, REFIID iid, void **device) +{ + FIXME("%p, %s, %p.\n", dxgi_device, debugstr_guid(iid), device); + + return E_NOTIMPL; +} + HRESULT WINAPI DCompositionCreateDevice2(IUnknown *rendering_device, REFIID iid, void **device) { FIXME("%p, %s, %p.\n", rendering_device, debugstr_guid(iid), device);

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in autoplug_blacklist().
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: c59bd77679685ab3e026e2e694c013dd7d8da60f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c59bd77679685ab3e026e2e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 14 10:37:51 2021 -0600 winegstreamer: Avoid using Wine debug functions in autoplug_blacklist(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 992cdf01755..06fc630e47a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -41,6 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +GST_DEBUG_CATEGORY_STATIC(wine); +#define GST_CAT_DEFAULT wine + static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; struct gstdemux @@ -1305,15 +1308,18 @@ static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, { const char *name = gst_element_factory_get_longname(fact); - if (strstr(name, "Player protection")) { - WARN("Blacklisted a/52 decoder because it only works in Totem\n"); + GST_TRACE("Using \"%s\".", name); + + if (strstr(name, "Player protection")) + { + GST_WARNING("Blacklisted a/52 decoder because it only works in Totem."); return GST_AUTOPLUG_SELECT_SKIP; } - if (!strcmp(name, "Fluendo Hardware Accelerated Video Decoder")) { - WARN("Disabled video acceleration since it breaks in wine\n"); + if (!strcmp(name, "Fluendo Hardware Accelerated Video Decoder")) + { + GST_WARNING("Disabled video acceleration since it breaks in wine."); return GST_AUTOPLUG_SELECT_SKIP; } - TRACE("using \"%s\"\n", name); return GST_AUTOPLUG_SELECT_TRY; } @@ -1812,11 +1818,19 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, return VFW_S_NO_MORE_ITEMS; } +static BOOL parser_init_gstreamer(void) +{ + if (!init_gstreamer()) + return FALSE; + GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); + return TRUE; +} + HRESULT gstdemux_create(IUnknown *outer, IUnknown **out) { struct gstdemux *object; - if (!init_gstreamer()) + if (!parser_init_gstreamer()) return E_FAIL; mark_wine_thread(); @@ -2466,7 +2480,7 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; struct gstdemux *object; - if (!init_gstreamer()) + if (!parser_init_gstreamer()) return E_FAIL; mark_wine_thread(); @@ -2585,7 +2599,7 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; struct gstdemux *object; - if (!init_gstreamer()) + if (!parser_init_gstreamer()) return E_FAIL; mark_wine_thread(); @@ -2744,7 +2758,7 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) static const WCHAR sink_name[] = {'I','n','p','u','t',0}; struct gstdemux *object; - if (!init_gstreamer()) + if (!parser_init_gstreamer()) return E_FAIL; mark_wine_thread();

1 0

Alistair Leslie-Hughes : msado15: Only support put CursorLocation on Closed Recordset.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 44501a2781010259921cbb34495ff8109173da08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44501a2781010259921cbb34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:13 2021 +1100 msado15: Only support put CursorLocation on Closed Recordset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e915922fdc4..e830f66e1ba 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1279,6 +1279,8 @@ static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLoc TRACE( "%p, %u\n", iface, cursor_loc ); + if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + recordset->cursor_location = cursor_loc; return S_OK;

1 0

Martin Storsjo : include: Don't use __attribute__((pcs("aapcs-vfp"))) when building in PE mode.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 52398912f954a28007468c41be7d108e0f9f11bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=52398912f954a28007468c41… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 11 23:00:21 2021 +0200 include: Don't use __attribute__((pcs("aapcs-vfp"))) when building in PE mode. Clang doesn't support this attribute for windows targets right now; the attribute is only needed for selecting a potentially non-default calling convention on e.g. linux. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 4 ++-- include/windef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index a66f43877ac..4adbe0920f6 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -79,7 +79,7 @@ # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) @@ -120,7 +120,7 @@ #endif #ifndef WINAPIV -# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define WINAPIV __attribute__((pcs("aapcs"))) # else # define WINAPIV __cdecl diff --git a/include/windef.h b/include/windef.h index 5351afe66db..ac2ec619fbd 100644 --- a/include/windef.h +++ b/include/windef.h @@ -72,7 +72,7 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) @@ -120,7 +120,7 @@ extern "C" { # endif #endif -#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define WINAPIV __attribute__((pcs("aapcs"))) #else # define WINAPIV __cdecl

1 0

Paul Gofman : dbghelp: Support UWOP_PUSH_MACHFRAME on x64.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 400520192284c34e5b34b52b657cd3dda084403f URL: https://source.winehq.org/git/wine.git/?a=commit;h=400520192284c34e5b34b52b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 15 16:06:41 2021 +0300 dbghelp: Support UWOP_PUSH_MACHFRAME on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c04d8db61cf..8e8ac85dd2f 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -474,6 +474,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, DWORD64 newframe, prolog_offset, off, value; M128A floatvalue; union handler_data handler_data; + BOOL mach_frame = FALSE; /* FIXME: we have some assumptions here */ assert(context); @@ -556,7 +557,23 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, set_float_reg(context, info->UnwindCode[i].u.OpInfo, floatvalue); break; case UWOP_PUSH_MACHFRAME: - FIXME("PUSH_MACHFRAME %u\n", info->UnwindCode[i].u.OpInfo); + if (info->Flags & UNW_FLAG_CHAININFO) + { + FIXME("PUSH_MACHFRAME with chained unwind info.\n"); + break; + } + if (i + get_opcode_size(info->UnwindCode[i]) < info->CountOfCodes) + { + FIXME("PUSH_MACHFRAME is not the last opcode.\n"); + break; + } + + if (info->UnwindCode[i].u.OpInfo) + context->Rsp += 0x8; + + if (!sw_read_mem(csw, context->Rsp, &context->Rip, sizeof(DWORD64))) return FALSE; + if (!sw_read_mem(csw, context->Rsp + 24, &context->Rsp, sizeof(DWORD64))) return FALSE; + mach_frame = TRUE; break; default: FIXME("unknown code %u\n", info->UnwindCode[i].u.UnwindOp); @@ -569,7 +586,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, &handler_data, sizeof(handler_data))) return FALSE; function = &handler_data.chain; /* restart with the chained info */ } - return default_unwind(csw, context); + return mach_frame ? TRUE : default_unwind(csw, context); } /* fetch_next_frame()

1 0

Alexandre Julliard : packaging: Update .deb package names for new OBS scheme.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: tools Branch: master Commit: d0538f3bad27a742ca19b37fae1ecdef16098399 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d0538f3bad27a742ca19b37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 21:19:06 2021 +0100 packaging: Update .deb package names for new OBS scheme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 6ddbc48..29960d3 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -71,14 +71,14 @@ add_deb () test -d $dstdir || mkdir -p $dstdir for arch in $deb_archs do - rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}_$arch.deb $dstdir/binary-$arch/ + rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}-1_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}-1_$arch.deb $dstdir/binary-$arch/ done - dscverify -u $obsdir/$source_pkg\~$2.dsc - if test -f $obsdir/$source_pkg\~$2.diff.gz + dscverify -u $obsdir/$source_pkg\~$2-1.dsc + if test -f $obsdir/$source_pkg\~$2-1.diff.gz then - rsync -aq $obsdir/$source_pkg\~$2.dsc $obsdir/$source_pkg\~$2.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-1.dsc $obsdir/$source_pkg\~$2-1.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ else - rsync -aq $obsdir/$source_pkg\~$2.dsc $obsdir/$source_pkg\~$2.tar.xz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-1.dsc $obsdir/$source_pkg\~$2-1.debian.tar.xz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ fi if test -n "$4"

1 0

Francois Gouget : testbot/build: ARCH_STRING has been renamed to GECKO_ARCH.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: tools Branch: master Commit: 6af8a63bf067a4a6d6bed9112efb681de0c49482 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6af8a63bf067a4a6d6bed91… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 15 16:14:41 2021 +0100 testbot/build: ARCH_STRING has been renamed to GECKO_ARCH. This matches the MONO_ARCH property. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index aa78618..a56a4f2 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -490,11 +490,7 @@ sub UpdateAddOns() my $Arch = ""; while (my $Line= <$fh>) { - if ($Line =~ /^\s*#\s*define\s+ARCH_STRING\s+"([^"]+)"/) - { - $Arch = $1; - } - elsif ($Line =~ /^\s*#\s*define\s+(?:GECKO|MONO)_ARCH\s+"([^"]+)"/) + if ($Line =~ /^\s*#\s*define\s+(?:GECKO|MONO)_ARCH\s+"([^"]+)"/) { $Arch = $1; }

1 0