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

Jacek Caban : configure: Allow specifying cross debug format.
by Alexandre Julliard May 14, 2020

May 14, 2020

Module: wine Branch: master Commit: 8e051c5802e60e37b2187314180e94fc4b5f8071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e051c5802e60e37b2187314… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 16:40:03 2020 +0200 configure: Allow specifying cross debug format. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 53 +++++++++++++++++++++++++++++++++++++++++++++++------ configure.ac | 24 +++++++++++++++++------- 3 files changed, 65 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0e9b50c8f5..0e1f6cd6ca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,6 +69,7 @@ CONVERT = @CONVERT@ ICOTOOL = @ICOTOOL@ MSGFMT = @MSGFMT@ CROSSTARGET = @CROSSTARGET@ +CROSSDEBUG = @CROSSDEBUG@ SUBDIRS = @SUBDIRS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) diff --git a/configure b/configure index 27fb2fd0ed..f85e18b77f 100755 --- a/configure +++ b/configure @@ -705,6 +705,7 @@ X_PRE_LIBS X_CFLAGS XMKMF PTHREAD_LIBS +CROSSDEBUG DELAYLOADFLAG CROSSLDFLAGS EXTRACROSSCFLAGS @@ -10520,9 +10521,19 @@ if test "x$ac_cv_crosscflags__Wnonnull" = xyes; then : fi ;; esac - for ac_flag in $CROSSCFLAGS; do - case $ac_flag in - -g) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gdwarf-2" >&5 + + if test -z "$CROSSDEBUG" + then + for ac_flag in $CROSSCFLAGS; do + case $ac_flag in + -gdwarf*) CROSSDEBUG=dwarf ;; + -gcodeview) CROSSDEBUG=pdb ;; + -g) CROSSDEBUG=${CROSSDEBUG:-dwarf} ;; + esac + done + fi + case $CROSSDEBUG in + *dwarf) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gdwarf-2" >&5 $as_echo_n "checking whether the cross-compiler supports -gdwarf-2... " >&6; } if ${ac_cv_crosscflags__gdwarf_2+:} false; then : $as_echo_n "(cached) " >&6 @@ -10553,7 +10564,7 @@ $as_echo "$ac_cv_crosscflags__gdwarf_2" >&6; } if test "x$ac_cv_crosscflags__gdwarf_2" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gdwarf-2" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gstrict-dwarf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gstrict-dwarf" >&5 $as_echo_n "checking whether the cross-compiler supports -gstrict-dwarf... " >&6; } if ${ac_cv_crosscflags__gstrict_dwarf+:} false; then : $as_echo_n "(cached) " >&6 @@ -10584,8 +10595,38 @@ $as_echo "$ac_cv_crosscflags__gstrict_dwarf" >&6; } if test "x$ac_cv_crosscflags__gstrict_dwarf" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gstrict-dwarf" fi ;; - esac - done + pdb) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gcodeview" >&5 +$as_echo_n "checking whether the cross-compiler supports -gcodeview... " >&6; } +if ${ac_cv_crosscflags__gcodeview+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -gcodeview" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__gcodeview=yes +else + ac_cv_crosscflags__gcodeview=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__gcodeview" >&5 +$as_echo "$ac_cv_crosscflags__gcodeview" >&6; } +if test "x$ac_cv_crosscflags__gcodeview" = xyes; then : + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gcodeview" +fi ;; + esac if test "x$enable_werror" = "xyes" then diff --git a/configure.ac b/configure.ac index 3e0511325c..0dbcb3d095 100644 --- a/configure.ac +++ b/configure.ac @@ -1100,13 +1100,23 @@ then WINE_TRY_CROSSCFLAGS([-Wnonnull]) ;; esac - dnl Default to dwarf-2 debug info - for ac_flag in $CROSSCFLAGS; do - case $ac_flag in - -g) WINE_TRY_CROSSCFLAGS([-gdwarf-2]) - WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;; - esac - done + dnl Determine debug info format + AC_SUBST(CROSSDEBUG) + if test -z "$CROSSDEBUG" + then + for ac_flag in $CROSSCFLAGS; do + case $ac_flag in + -gdwarf*) CROSSDEBUG=dwarf ;; + -gcodeview) CROSSDEBUG=pdb ;; + -g) CROSSDEBUG=${CROSSDEBUG:-dwarf} ;; + esac + done + fi + case $CROSSDEBUG in + *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-2]) + WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;; + pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;; + esac if test "x$enable_werror" = "xyes" then

1 0

Murray Colpman : winex11.drv: Interpret mouse 6/7 as horiz scroll.
by Alexandre Julliard May 14, 2020

May 14, 2020

Module: wine Branch: master Commit: 893080e4df5a45929320ebb88b8668eea316476c URL: https://source.winehq.org/git/wine.git/?a=commit;h=893080e4df5a45929320ebb8… Author: Murray Colpman <muzer(a)tim32.org> Date: Tue May 12 00:39:02 2020 +0100 winex11.drv: Interpret mouse 6/7 as horiz scroll. X11 Mouse buttons 6 and 7 were set to translate into browser back/forward button events. However, this is based on an old convention where buttons 6 and 7 could either mean horizontal scroll or browser back/forward. Nowadays, 6 and 7 solely mean horizontal scroll, 8 and 9 being used for back/forward. In addition, the wide adoption of two-finger two-dimensional scrolling on laptop trackpads since this code was written has meant that back/forward events may be generated unintentionally, which can be very disruptive when using tools such as web browsers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49142 Signed-off-by: Murray Colpman <muzer(a)tim32.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d4bfc5a196..d78449c2cc 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -74,8 +74,8 @@ static const UINT button_down_flags[NB_BUTTONS] = MOUSEEVENTF_RIGHTDOWN, MOUSEEVENTF_WHEEL, MOUSEEVENTF_WHEEL, - MOUSEEVENTF_XDOWN, /* FIXME: horizontal wheel */ - MOUSEEVENTF_XDOWN, + MOUSEEVENTF_HWHEEL, + MOUSEEVENTF_HWHEEL, MOUSEEVENTF_XDOWN, MOUSEEVENTF_XDOWN }; @@ -87,8 +87,8 @@ static const UINT button_up_flags[NB_BUTTONS] = MOUSEEVENTF_RIGHTUP, 0, 0, - MOUSEEVENTF_XUP, - MOUSEEVENTF_XUP, + 0, + 0, MOUSEEVENTF_XUP, MOUSEEVENTF_XUP }; @@ -100,8 +100,8 @@ static const UINT button_down_data[NB_BUTTONS] = 0, WHEEL_DELTA, -WHEEL_DELTA, - XBUTTON1, - XBUTTON2, + -WHEEL_DELTA, + WHEEL_DELTA, XBUTTON1, XBUTTON2 }; @@ -113,8 +113,8 @@ static const UINT button_up_data[NB_BUTTONS] = 0, 0, 0, - XBUTTON1, - XBUTTON2, + 0, + 0, XBUTTON1, XBUTTON2 };

1 0

Paul Gofman : wined3d: Allow setting user memory for mipmapped textures in wined3d_texture_update_desc().
by Alexandre Julliard May 14, 2020

May 14, 2020

Module: wine Branch: master Commit: f02b0226caa7a7a3f1c45563f144aee506044be6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f02b0226caa7a7a3f1c45563… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 14 20:13:44 2020 +0430 wined3d: Allow setting user memory for mipmapped textures in wined3d_texture_update_desc(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49105 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 96 ++++++++++++++++++++++++++++++++++++--- dlls/wined3d/texture.c | 113 +++++++++++++++++++++++++++------------------- 2 files changed, 155 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f02b0226caa7a7a3f1c4…

1 0

Stefan Dösinger : wined3d: Implement Vulkan NULL 3D image shader resource view descriptors.
by Alexandre Julliard May 14, 2020

May 14, 2020

Module: wine Branch: master Commit: dbe014212c7c9758e54e56dd2baceb2770d9c670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbe014212c7c9758e54e56dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 14 17:51:47 2020 +0430 wined3d: Implement Vulkan NULL 3D image shader resource view descriptors. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 4 ++++ dlls/wined3d/device.c | 23 +++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 29 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0bd4f2260a..c53b9aa6c6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1348,6 +1348,10 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2dms, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_3D: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_3d, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2d_array, NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 24be8adc67..23eeed47c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -811,10 +811,18 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk goto fail; } + if (!wined3d_null_image_vk_init(&r->image_3d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_3D, 1)) + { + ERR("Failed to create 3D image.\n"); + goto fail; + } + return true; fail: id = context_vk->current_command_buffer.id; + if (r->image_2dms.vk_image) + wined3d_null_image_vk_cleanup(&r->image_2dms, context_vk, id); if (r->image_2d.vk_image) wined3d_null_image_vk_cleanup(&r->image_2d, context_vk, id); if (r->image_1d.vk_image) @@ -832,6 +840,7 @@ void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_v /* We don't track command buffer references to NULL resources. We easily * could, but it doesn't seem worth it. */ + wined3d_null_image_vk_cleanup(&r->image_3d, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_2dms, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_2d, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_1d, context_vk, id); @@ -921,6 +930,17 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st v->vk_info_2dms.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; TRACE("Created 2D MSAA image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2dms.imageView)); + view_desc.image = r->image_3d.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_3D; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_3d.imageView))) < 0) + { + ERR("Failed to create 3D image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_3d.sampler = VK_NULL_HANDLE; + v->vk_info_3d.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 3D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_3d.imageView)); + view_desc.image = r->image_2d.vk_image; view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2d_array.imageView))) < 0) @@ -948,6 +968,8 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st fail: if (v->vk_info_2d_array.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d_array.imageView, NULL)); + if (v->vk_info_3d.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_3d.imageView, NULL)); if (v->vk_info_2dms.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2dms.imageView, NULL)); if (v->vk_info_2d.imageView) @@ -967,6 +989,7 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms_array.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d_array.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_3d.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_1d.imageView, id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e87c364ab..ebbe379f2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3620,6 +3620,7 @@ struct wined3d_null_resources_vk struct wined3d_null_image_vk image_1d; struct wined3d_null_image_vk image_2d; struct wined3d_null_image_vk image_2dms; + struct wined3d_null_image_vk image_3d; }; struct wined3d_null_views_vk @@ -3630,6 +3631,7 @@ struct wined3d_null_views_vk VkDescriptorImageInfo vk_info_1d; VkDescriptorImageInfo vk_info_2d; VkDescriptorImageInfo vk_info_2dms; + VkDescriptorImageInfo vk_info_3d; VkDescriptorImageInfo vk_info_2d_array; VkDescriptorImageInfo vk_info_2dms_array; };

1 0

Henri Verbeet : wined3d: Implement Vulkan NULL 2D image shader resource view descriptors.
by Alexandre Julliard May 14, 2020

May 14, 2020

Module: wine Branch: master Commit: afa075360b4f2dde1cc5e4c33e0bbb5722884095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afa075360b4f2dde1cc5e4c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 14 17:51:46 2020 +0430 wined3d: Implement Vulkan NULL 2D image shader resource view descriptors. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 16 +++++++ dlls/wined3d/device.c | 104 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 6 +++ 3 files changed, 117 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afa075360b4f2dde1cc5…

1 0

Alexandre Julliard : ntdll: Handle already relocated .dynamic entries.
by Alexandre Julliard May 14, 2020

May 14, 2020

Module: wine Branch: master Commit: 6a12d93b88145cb1f31e89c6faca39184fb819ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a12d93b88145cb1f31e89c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 14 12:24:57 2020 +0200 ntdll: Handle already relocated .dynamic entries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49139 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b5091e2b56..814a600f2e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1340,12 +1340,14 @@ static void call_constructors( WINE_MODREF *wm ) if (dlinfo( wm->so_handle, RTLD_DI_LINKMAP, &map ) == -1) return; for (dyn = map->l_ld; dyn->d_tag; dyn++) { +#define GET_PTR(base,ptr) ((ptr) > (base) ? (ptr) : (base) + (ptr)) switch (dyn->d_tag) { - case 0x60009990: init_array = (void *)((char *)map->l_addr + dyn->d_un.d_val); break; + case 0x60009990: init_array = (void *)GET_PTR( map->l_addr, dyn->d_un.d_ptr ); break; case 0x60009991: init_arraysz = dyn->d_un.d_val; break; - case 0x60009992: init_func = (void *)((char *)map->l_addr + dyn->d_un.d_val); break; + case 0x60009992: init_func = (void *)GET_PTR( map->l_addr, dyn->d_un.d_ptr ); break; } +#undef GET_PTR } TRACE( "%s: got init_func %p init_array %p %lu\n", debugstr_us( &wm->ldr.BaseDllName ),

1 0

Zebediah Figura : devenum: Use calloc() in enum_moniker_create().
by Alexandre Julliard May 14, 2020

May 14, 2020

Module: wine Branch: master Commit: af68dafc638a6c534b39913c44c717bdf95ff5e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af68dafc638a6c534b39913c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 13 17:03:07 2020 -0500 devenum: Use calloc() in enum_moniker_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 9176d8470d..07dcb1438f 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -789,7 +789,7 @@ static ULONG WINAPI enum_moniker_Release(IEnumMoniker *iface) IEnumDMO_Release(This->dmo_enum); RegCloseKey(This->sw_key); RegCloseKey(This->cm_key); - CoTaskMemFree(This); + free(This); DEVENUM_UnlockModule(); return 0; } @@ -922,41 +922,43 @@ static const IEnumMonikerVtbl IEnumMoniker_Vtbl = enum_moniker_Clone, }; -HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **ppEnumMoniker) +HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **out) { - EnumMonikerImpl * pEnumMoniker = CoTaskMemAlloc(sizeof(EnumMonikerImpl)); + EnumMonikerImpl *object; WCHAR buffer[78]; HRESULT hr; - if (!pEnumMoniker) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - pEnumMoniker->IEnumMoniker_iface.lpVtbl = &IEnumMoniker_Vtbl; - pEnumMoniker->ref = 1; - pEnumMoniker->sw_index = 0; - pEnumMoniker->cm_index = 0; - pEnumMoniker->class = *class; + object->IEnumMoniker_iface.lpVtbl = &IEnumMoniker_Vtbl; + object->ref = 1; + object->class = *class; lstrcpyW(buffer, clsidW); lstrcatW(buffer, backslashW); StringFromGUID2(class, buffer + lstrlenW(buffer), CHARS_IN_GUID); lstrcatW(buffer, instanceW); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, buffer, 0, KEY_ENUMERATE_SUB_KEYS, &pEnumMoniker->sw_key)) - pEnumMoniker->sw_key = NULL; + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, buffer, 0, KEY_ENUMERATE_SUB_KEYS, &object->sw_key)) + object->sw_key = NULL; lstrcpyW(buffer, wszActiveMovieKey); StringFromGUID2(class, buffer + lstrlenW(buffer), CHARS_IN_GUID); - if (RegOpenKeyExW(HKEY_CURRENT_USER, buffer, 0, KEY_ENUMERATE_SUB_KEYS, &pEnumMoniker->cm_key)) - pEnumMoniker->cm_key = NULL; + if (RegOpenKeyExW(HKEY_CURRENT_USER, buffer, 0, KEY_ENUMERATE_SUB_KEYS, &object->cm_key)) + object->cm_key = NULL; - hr = DMOEnum(class, 0, 0, NULL, 0, NULL, &pEnumMoniker->dmo_enum); + hr = DMOEnum(class, 0, 0, NULL, 0, NULL, &object->dmo_enum); if (FAILED(hr)) { - IEnumMoniker_Release(&pEnumMoniker->IEnumMoniker_iface); + if (object->cm_key) + RegCloseKey(object->cm_key); + if (object->sw_key) + RegCloseKey(object->sw_key); + free(object); return hr; } - *ppEnumMoniker = &pEnumMoniker->IEnumMoniker_iface; + *out = &object->IEnumMoniker_iface; DEVENUM_LockModule();

1 0

Alexandre Julliard : ntdll: Fix __sync_bool_compare_and_swap() usage.
by Alexandre Julliard May 14, 2020

May 14, 2020

Module: wine Branch: master Commit: adb52247e3aa96d736cb84f520237f05a28e82cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb52247e3aa96d736cb84f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 14 11:57:14 2020 +0200 ntdll: Fix __sync_bool_compare_and_swap() usage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 3018c1e88f..6134a5e702 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -118,7 +118,7 @@ static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int6 : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), "c" (xchg_high), "b" (xchg_low) ); #else - ret = __sync_bool_compare_and_swap( (__int128 *)dest, (__int128 *)compare, + ret = __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); #endif return ret;

1 0

Gijs Vermeulen : setupapi: Correct SetupDiGetActualSectionToInstall[Ex]A/W .spec file entries.
by Alexandre Julliard May 14, 2020

May 14, 2020

Module: wine Branch: master Commit: 288515c51fdb1110565419ee87a690dd0a6a82ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=288515c51fdb1110565419ee… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed May 13 22:04:08 2020 +0200 setupapi: Correct SetupDiGetActualSectionToInstall[Ex]A/W .spec file entries. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 26b4a6f7fb..ceb4904b18 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -315,10 +315,10 @@ @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) @ stdcall SetupDiEnumDriverInfoA(ptr ptr long long ptr) @ stdcall SetupDiEnumDriverInfoW(ptr ptr long long ptr) -@ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr) -@ stdcall SetupDiGetActualSectionToInstallExA(long str ptr str long ptr ptr ptr) -@ stdcall SetupDiGetActualSectionToInstallExW(long wstr ptr wstr long ptr ptr ptr) -@ stdcall SetupDiGetActualSectionToInstallW(long wstr wstr long ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallA(long str ptr long ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallExA(long str ptr ptr long ptr ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallExW(long wstr ptr ptr long ptr ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallW(long wstr ptr long ptr ptr) @ stdcall SetupDiGetClassBitmapIndex(ptr ptr) @ stdcall SetupDiGetClassDescriptionA(ptr str long ptr) @ stdcall SetupDiGetClassDescriptionExA(ptr str long ptr str ptr)

1 0

Zebediah Figura : quartz/tests: Fix a crash in test_allocate_surface_helper().
by Alexandre Julliard May 14, 2020

May 14, 2020

Module: wine Branch: master Commit: 3145b67273c5fadb09a04ba17384a6ee8c16e342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3145b67273c5fadb09a04ba1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 13 17:34:58 2020 -0500 quartz/tests: Fix a crash in test_allocate_surface_helper(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index e3efe56e44..57e92ad714 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2622,18 +2622,22 @@ static void test_allocate_surface_helper(void) HRESULT hr; ULONG ref; + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, + rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); + if (!(device = create_device(window))) + { + IBaseFilter_Release(filter); + DestroyWindow(window); + return; + } + IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)&notify); count = 2; hr = IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(notify, &info, &count, surfaces); todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); - AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); - window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, - rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); - if (!(device = create_device(window))) - goto out; - hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE) {

1 0