September 2022 - Wine-commits

Brendan Shanks : wined3d: Set name of internal threads.
by Alexandre Julliard 27 Sep '22

27 Sep '22

Module: wine Branch: master Commit: a2c03e23565779d2743f5750c37de0be3f7222bf URL: https://gitlab.winehq.org/wine/wine/-/commit/a2c03e23565779d2743f5750c37de0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Sep 26 14:15:40 2022 -0700 wined3d: Set name of internal threads. --- dlls/wined3d/cs.c | 1 + dlls/wined3d/directx.c | 2 ++ dlls/wined3d/swapchain.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8ddcb95ddcc..8ee7e7fccc9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3354,6 +3354,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) bool run = true; TRACE("Started.\n"); + SetThreadDescription(GetCurrentThread(), L"wined3d_cs"); /* Copy the module handle to a local variable to avoid racing with the * thread freeing "cs" before the FreeLibraryAndExitThread() call. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a27c15b0ba..8590bd4800a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1069,6 +1069,8 @@ static DWORD CALLBACK notification_thread_func(void *stop_event) struct wined3d_video_memory_info info; HRESULT hr; + SetThreadDescription(GetCurrentThread(), L"wined3d_budget_change_notification"); + while (TRUE) { wined3d_mutex_lock(); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9f2d41b757a..80e630fd41e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2194,6 +2194,8 @@ static DWORD WINAPI wined3d_set_window_state(void *ctx) struct wined3d_window_state *s = ctx; bool filter; + SetThreadDescription(GetCurrentThread(), L"wined3d_set_window_state"); + filter = wined3d_filter_messages(s->window, TRUE); if (s->set_style)

1 0

Zebediah Figura : d3d9: Factor out d3d9_texture_init().
by Alexandre Julliard 27 Sep '22

27 Sep '22

Module: wine Branch: master Commit: 46c9897bdf95548e4a9b3596ebc2160cac192f0a URL: https://gitlab.winehq.org/wine/wine/-/commit/46c9897bdf95548e4a9b3596ebc216… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 18:39:28 2022 -0500 d3d9: Factor out d3d9_texture_init(). --- dlls/d3d9/d3d9_private.h | 13 ++-- dlls/d3d9/device.c | 6 +- dlls/d3d9/texture.c | 185 +++++++++++++---------------------------------- 3 files changed, 61 insertions(+), 143 deletions(-)

1 0

Zebediah Figura : d3d9: Introduce a d3d9_texture_preload() helper.
by Alexandre Julliard 27 Sep '22

27 Sep '22

Module: wine Branch: master Commit: d5bb5705427881e288a19796e9f08d91c6dc9722 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5bb5705427881e288a19796e9f08d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 18:40:24 2022 -0500 d3d9: Introduce a d3d9_texture_preload() helper. --- dlls/d3d9/texture.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 8f4798fa81c..48722c64348 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -22,6 +22,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static void d3d9_texture_preload(struct d3d9_texture *texture) +{ + wined3d_mutex_lock(); + wined3d_resource_preload(wined3d_texture_get_resource(texture->wined3d_texture)); + wined3d_mutex_unlock(); +} + static inline struct d3d9_texture *impl_from_IDirect3DTexture9(IDirect3DTexture9 *iface) { return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface); @@ -246,9 +253,7 @@ static void WINAPI d3d9_texture_2d_PreLoad(IDirect3DTexture9 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - wined3d_resource_preload(wined3d_texture_get_resource(texture->wined3d_texture)); - wined3d_mutex_unlock(); + d3d9_texture_preload(texture); } static D3DRESOURCETYPE WINAPI d3d9_texture_2d_GetType(IDirect3DTexture9 *iface) @@ -644,9 +649,7 @@ static void WINAPI d3d9_texture_cube_PreLoad(IDirect3DCubeTexture9 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - wined3d_resource_preload(wined3d_texture_get_resource(texture->wined3d_texture)); - wined3d_mutex_unlock(); + d3d9_texture_preload(texture); } static D3DRESOURCETYPE WINAPI d3d9_texture_cube_GetType(IDirect3DCubeTexture9 *iface) @@ -1062,9 +1065,7 @@ static void WINAPI d3d9_texture_3d_PreLoad(IDirect3DVolumeTexture9 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - wined3d_resource_preload(wined3d_texture_get_resource(texture->wined3d_texture)); - wined3d_mutex_unlock(); + d3d9_texture_preload(texture); } static D3DRESOURCETYPE WINAPI d3d9_texture_3d_GetType(IDirect3DVolumeTexture9 *iface)

1 0

Zebediah Figura : d3d9: Add reference counting helpers for textures.
by Alexandre Julliard 27 Sep '22

27 Sep '22

Module: wine Branch: master Commit: 2091bb34c2b9420c2294f460bd6d8929069d3e73 URL: https://gitlab.winehq.org/wine/wine/-/commit/2091bb34c2b9420c2294f460bd6d89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 18:46:09 2022 -0500 d3d9: Add reference counting helpers for textures. --- dlls/d3d9/texture.c | 137 +++++++++++++++++++++------------------------------- 1 file changed, 54 insertions(+), 83 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 48722c64348..5308a7da08f 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -22,6 +22,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static ULONG d3d9_texture_incref(struct d3d9_texture *texture) +{ + ULONG ref = InterlockedIncrement(&texture->resource.refcount); + + TRACE("%p increasing refcount to %u.\n", texture, ref); + + if (ref == 1) + { + struct d3d9_surface *surface; + + IDirect3DDevice9Ex_AddRef(&texture->parent_device->IDirect3DDevice9Ex_iface); + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) + { + wined3d_rendertarget_view_incref(surface->wined3d_rtv); + } + wined3d_texture_incref(texture->wined3d_texture); + wined3d_mutex_unlock(); + } + + return ref; +} + +static ULONG d3d9_texture_decref(struct d3d9_texture *texture) +{ + ULONG ref = InterlockedDecrement(&texture->resource.refcount); + + TRACE("%p decreasing refcount to %u.\n", texture, ref); + + if (!ref) + { + IDirect3DDevice9Ex *parent_device = &texture->parent_device->IDirect3DDevice9Ex_iface; + struct d3d9_surface *surface; + + wined3d_mutex_lock(); + if (texture->wined3d_srv) + wined3d_shader_resource_view_decref(texture->wined3d_srv); + LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) + wined3d_rendertarget_view_decref(surface->wined3d_rtv); + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parent_device); + } + return ref; +} + static void d3d9_texture_preload(struct d3d9_texture *texture) { wined3d_mutex_lock(); @@ -84,23 +132,6 @@ static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource return texture->wined3d_srv; } -static void d3d9_texture_cleanup(struct d3d9_texture *texture) -{ - IDirect3DDevice9Ex *parent_device = &texture->parent_device->IDirect3DDevice9Ex_iface; - struct d3d9_surface *surface; - - wined3d_mutex_lock(); - if (texture->wined3d_srv) - wined3d_shader_resource_view_decref(texture->wined3d_srv); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice9Ex_Release(parent_device); -} - /* wined3d critical section must be taken by the caller. */ void d3d9_texture_gen_auto_mipmap(struct d3d9_texture *texture) { @@ -140,37 +171,15 @@ static HRESULT WINAPI d3d9_texture_2d_QueryInterface(IDirect3DTexture9 *iface, R static ULONG WINAPI d3d9_texture_2d_AddRef(IDirect3DTexture9 *iface) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - ULONG ref = InterlockedIncrement(&texture->resource.refcount); - - TRACE("%p increasing refcount to %u.\n", iface, ref); - - if (ref == 1) - { - struct d3d9_surface *surface; - IDirect3DDevice9Ex_AddRef(&texture->parent_device->IDirect3DDevice9Ex_iface); - wined3d_mutex_lock(); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) - { - wined3d_rendertarget_view_incref(surface->wined3d_rtv); - } - wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); - } - - return ref; + return d3d9_texture_incref(texture); } static ULONG WINAPI d3d9_texture_2d_Release(IDirect3DTexture9 *iface) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - ULONG ref = InterlockedDecrement(&texture->resource.refcount); - - TRACE("%p decreasing refcount to %u.\n", iface, ref); - if (!ref) - d3d9_texture_cleanup(texture); - return ref; + return d3d9_texture_decref(texture); } static HRESULT WINAPI d3d9_texture_2d_GetDevice(IDirect3DTexture9 *iface, IDirect3DDevice9 **device) @@ -536,37 +545,15 @@ static HRESULT WINAPI d3d9_texture_cube_QueryInterface(IDirect3DCubeTexture9 *if static ULONG WINAPI d3d9_texture_cube_AddRef(IDirect3DCubeTexture9 *iface) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - ULONG ref = InterlockedIncrement(&texture->resource.refcount); - - TRACE("%p increasing refcount to %u.\n", iface, ref); - if (ref == 1) - { - struct d3d9_surface *surface; - - IDirect3DDevice9Ex_AddRef(&texture->parent_device->IDirect3DDevice9Ex_iface); - wined3d_mutex_lock(); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) - { - wined3d_rendertarget_view_incref(surface->wined3d_rtv); - } - wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); - } - - return ref; + return d3d9_texture_incref(texture); } static ULONG WINAPI d3d9_texture_cube_Release(IDirect3DCubeTexture9 *iface) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - ULONG ref = InterlockedDecrement(&texture->resource.refcount); - TRACE("%p decreasing refcount to %u.\n", iface, ref); - - if (!ref) - d3d9_texture_cleanup(texture); - return ref; + return d3d9_texture_decref(texture); } static HRESULT WINAPI d3d9_texture_cube_GetDevice(IDirect3DCubeTexture9 *iface, IDirect3DDevice9 **device) @@ -958,31 +945,15 @@ static HRESULT WINAPI d3d9_texture_3d_QueryInterface(IDirect3DVolumeTexture9 *if static ULONG WINAPI d3d9_texture_3d_AddRef(IDirect3DVolumeTexture9 *iface) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - ULONG ref = InterlockedIncrement(&texture->resource.refcount); - - TRACE("%p increasing refcount to %u.\n", iface, ref); - if (ref == 1) - { - IDirect3DDevice9Ex_AddRef(&texture->parent_device->IDirect3DDevice9Ex_iface); - wined3d_mutex_lock(); - wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); - } - - return ref; + return d3d9_texture_incref(texture); } static ULONG WINAPI d3d9_texture_3d_Release(IDirect3DVolumeTexture9 *iface) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - ULONG ref = InterlockedDecrement(&texture->resource.refcount); - TRACE("%p decreasing refcount to %u.\n", iface, ref); - - if (!ref) - d3d9_texture_cleanup(texture); - return ref; + return d3d9_texture_decref(texture); } static HRESULT WINAPI d3d9_texture_3d_GetDevice(IDirect3DVolumeTexture9 *iface, IDirect3DDevice9 **device)

1 0

Zebediah Figura : d3d9: Use a separate draw texture for managed resources.
by Alexandre Julliard 27 Sep '22

27 Sep '22

Module: wine Branch: master Commit: 5f1cbb1b85e7d92b6c783a32ae85ca2902296481 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f1cbb1b85e7d92b6c783a32ae85ca… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 19:10:09 2022 -0500 d3d9: Use a separate draw texture for managed resources. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52954 --- dlls/d3d9/d3d9_private.h | 8 ++++- dlls/d3d9/device.c | 36 +++++++++++++++++++--- dlls/d3d9/tests/visual.c | 2 +- dlls/d3d9/texture.c | 80 ++++++++++++++++++++++++++++++++++-------------- 4 files changed, 97 insertions(+), 29 deletions(-)

1 0

Zebediah Figura : ddraw: Add FPS tracing in ddraw_surface_update_frontbuffer().
by Alexandre Julliard 27 Sep '22

27 Sep '22

Module: wine Branch: master Commit: 13163832683a689373cef7d8815bd6e941a8d789 URL: https://gitlab.winehq.org/wine/wine/-/commit/13163832683a689373cef7d8815bd6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 10 16:47:57 2022 -0500 ddraw: Add FPS tracing in ddraw_surface_update_frontbuffer(). This usually doesn't go through the normal presentation paths. --- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/surface.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0c2a491d45b..159ce987dc3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -136,6 +136,9 @@ struct ddraw struct wined3d_stateblock *state; const struct wined3d_stateblock_state *stateblock_state; + + unsigned int frames; + DWORD prev_frame_time; }; #define DDRAW_WINDOW_CLASS_NAME "DirectDrawDeviceWnd" diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e4382a74ecd..4a95067996f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -24,6 +24,7 @@ #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +WINE_DECLARE_DEBUG_CHANNEL(fps); static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface); static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); @@ -87,6 +88,21 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (w <= 0 || h <= 0) return DD_OK; + if (!read && TRACE_ON(fps)) + { + DWORD time = GetTickCount(); + ++ddraw->frames; + + /* every 1.5 seconds */ + if (time - ddraw->prev_frame_time > 1500) + { + TRACE_(fps)("%p @ approx %.2ffps\n", + ddraw, 1000.0 * ddraw->frames / (time - ddraw->prev_frame_time)); + ddraw->prev_frame_time = time; + ddraw->frames = 0; + } + } + /* The interaction between ddraw and GDI drawing is not all that well * documented, and somewhat arcane. In ddraw exclusive mode, GDI draws * seemingly go to the *original* frontbuffer/primary surface, while ddraw

1 0

Eric Pouech : krnl386.exe16: Don't pass NULL to printf/%s).
by Alexandre Julliard 27 Sep '22

27 Sep '22

Module: wine Branch: master Commit: 6b1f0515137ec672aa65f26ae9258314d1b12d96 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b1f0515137ec672aa65f26ae92583… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 27 11:37:24 2022 +0200 krnl386.exe16: Don't pass NULL to printf/%s). GCC12.2 emits a warning here. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/krnl386.exe16/vxd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index 8a1769f23c4..a707fc36043 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -1323,7 +1323,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context ) if (!atom || GlobalGetAtomNameA(atom, name, sizeof(name))) { - TRACE("NtCreateSection: name=%s\n", atom? name : NULL); + TRACE("NtCreateSection: name=%s\n", atom? name : ""); result = CreateFileMappingA(hFile, NULL, protect, size? size->u.HighPart : 0,

1 0

Alexandre Julliard : gitlab: Run the full test suite on merge requests.
by Alexandre Julliard 27 Sep '22

27 Sep '22

Module: wine Branch: master Commit: 9c5b2bd62c8a7d89d4d3849c61dc91b471e5fb22 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c5b2bd62c8a7d89d4d3849c61dc91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 16:36:20 2022 +0200 gitlab: Run the full test suite on merge requests. --- tools/gitlab/build.yml | 5 ++--- tools/gitlab/test.yml | 12 ++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index ba654485488..6bc253b2c77 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -29,10 +29,9 @@ build-linux: rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' artifacts: - when: on_failure + expire_in: 1 day paths: - - build64/config.log - - build32/config.log + - usr/local/ script: - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index a7edd17f447..66079527be5 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -42,6 +42,18 @@ - wine wineboot.exe -u - wineserver -w +test-linux-32: + extends: .wine-test + variables: + EXCLUDE_TESTS: "d3d10core:d3d10core d3d11:d3d11 d3d8:device d3d8:visual d3d9:d3d9ex d3d9:device d3d9:visual" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + needs: + - job: build-linux + script: + - export WINETEST_COLOR=1 + - wine usr/local/lib/wine/i386-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -n $EXCLUDE_TESTS + debian-32: extends: .wine-test rules:

1 0

Alexandre Julliard : Revert "oleaut32: Dereference VT_RECORD|VT_BYREF in place.".
by Alexandre Julliard 27 Sep '22

27 Sep '22

Module: wine Branch: master Commit: 02ce1008b7876d9f86dfc5844c4be17307b8e055 URL: https://gitlab.winehq.org/wine/wine/-/commit/02ce1008b7876d9f86dfc5844c4be1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 09:16:05 2022 +0200 Revert "oleaut32: Dereference VT_RECORD|VT_BYREF in place.". This reverts commit 28e0d8ff3bd0db62e5b15f9b1e3c805b10dd198d. It breaks the tests. --- dlls/oleaut32/tests/vartest.c | 60 ------------------------------------------- dlls/oleaut32/variant.c | 2 +- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 782142a3ca2..342133d6403 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -902,19 +902,6 @@ static void test_VariantClear(void) ok(recinfo->recordclear == 1, "got %d\n", recinfo->recordclear); ok(recinfo->ref == 1, "got %ld\n", recinfo->ref); IRecordInfo_Release(&recinfo->IRecordInfo_iface); - - /* RECORD BYREF */ - recinfo = get_test_recordinfo(); - V_VT(&v) = VT_RECORD|VT_BYREF; - V_RECORDINFO(&v) = &recinfo->IRecordInfo_iface; - V_RECORD(&v) = recinfo->validsrc; - hres = VariantClear(&v); - ok(hres == S_OK, "ret %08lx\n", hres); - ok(V_VT(&v) == VT_EMPTY, "got vt = %d",V_VT(&v)); - /* BYREF does not own the pointed-to V_RECORD/INFO, so no RecordClear and no Release */ - ok(recinfo->recordclear == 0, "got %d\n", recinfo->recordclear); - ok(recinfo->ref == 1, "got %ld\n", recinfo->ref); - IRecordInfo_Release(&recinfo->IRecordInfo_iface); } static void test_VariantCopy(void) @@ -1082,7 +1069,6 @@ static void test_VariantCopyInd(void) size_t i; BYTE buffer[64]; HRESULT hres, hExpected; - IRecordInfoImpl *recinfo; memset(buffer, 0, sizeof(buffer)); @@ -1273,52 +1259,6 @@ static void test_VariantCopyInd(void) hres = VariantCopyInd(&vDst, &vSrc); ok(hres == E_INVALIDARG, "CopyInd(ref->ref): expected E_INVALIDARG, got 0x%08lx\n", hres); - - /* source data for a deep-copy of VT_BYREF|VT_RECORD... */ - recinfo = get_test_recordinfo(); - V_VT(&vSrc) = VT_RECORD|VT_BYREF; - V_RECORDINFO(&vSrc) = &recinfo->IRecordInfo_iface; - V_RECORD(&vSrc) = recinfo->validsrc; - - /* into a separate vDst */ - VariantInit(&vDst); - hres = VariantCopyInd(&vDst, &vSrc); - ok(hres == S_OK, "VariantCopyInd failed: 0x%08lx\n", hres); - ok(V_VT(&vDst) == VT_RECORD, "got vt = %d|0x%X\n", V_VT(&vDst) & VT_TYPEMASK, V_VT(&vDst) & ~VT_TYPEMASK); - ok(V_RECORDINFO(&vDst) == &recinfo->IRecordInfo_iface, "got %p\n", V_RECORDINFO(&vDst)); - ok(recinfo->recordclear == 0,"got %d\n", recinfo->recordclear); - ok(V_RECORD(&vDst) != recinfo->validsrc, "expected a newly-allocated deep copy\n"); - ok(recinfo->getsize == 1,"got %d\n", recinfo->getsize); - ok(recinfo->recordcopy == 1,"got %d\n", recinfo->recordcopy); - ok(recinfo->ref == 2,"got %ld\n", recinfo->ref); - - VariantClear(&vDst); - ok(recinfo->ref == 1,"got %ld\n", recinfo->ref); - ok(recinfo->recordclear == 1,"got %d\n", recinfo->recordclear); - - recinfo->getsize = 0; - recinfo->recordcopy = 0; - recinfo->recordclear = 0; - - /* and also in-place */ - hres = VariantCopyInd(&vSrc, &vSrc); - ok(V_VT(&vSrc) == VT_RECORD, "got vt = %d|0x%X\n", V_VT(&vSrc) & VT_TYPEMASK, V_VT(&vSrc) & ~VT_TYPEMASK); - ok(V_RECORDINFO(&vSrc) == &recinfo->IRecordInfo_iface, "got %p\n", V_RECORDINFO(&vSrc)); - /* ++ref and no RecordClear, since the source BYREF does not own the V_RECORD/INFO - * which it pointed to, and thus did not free them when overwritten */ - ok(recinfo->ref == 2,"got %ld\n", recinfo->ref); - ok(recinfo->recordclear == 0,"got %d\n", recinfo->recordclear); - - ok(V_RECORD(&vDst) != recinfo->validsrc, "expected a newly-allocated deep copy\n"); - ok(recinfo->getsize == 1,"got %d\n", recinfo->getsize); - ok(recinfo->recordcopy == 1,"got %d\n", recinfo->recordcopy); - - /* but the no-longer-BYREF output owns and will free its copies */ - VariantClear(&vSrc); - ok(recinfo->ref == 1,"got %ld\n", recinfo->ref); - ok(recinfo->recordclear == 1,"got %d\n", recinfo->recordclear); - - IRecordInfo_Release(&recinfo->IRecordInfo_iface); } static HRESULT (WINAPI *pVarParseNumFromStr)(const OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index ec0c9544a61..885082cc659 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -879,7 +879,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, const VARIANTARG* pvargSrc) } else if (V_VT(pSrc) == (VT_RECORD|VT_BYREF)) { - hres = VARIANT_CopyIRecordInfo(pvargDest, pSrc); + hres = VARIANT_CopyIRecordInfo(pvargDest, pvargSrc); } else if (V_VT(pSrc) == (VT_DISPATCH|VT_BYREF) || V_VT(pSrc) == (VT_UNKNOWN|VT_BYREF))

1 0

Alexandre Julliard : Revert "oleaut32/tests: Get_test_recordinfo shouldn't point into a specific VARIANT.".
by Alexandre Julliard 27 Sep '22

27 Sep '22

Module: wine Branch: master Commit: dbaa64271748e0a7f5ff9a5bad3f61d5e80f3851 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbaa64271748e0a7f5ff9a5bad3f61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 09:16:16 2022 +0200 Revert "oleaut32/tests: Get_test_recordinfo shouldn't point into a specific VARIANT.". This reverts commit 27f417eb9382e07617d37029bdca3bbaadf9f10d. It breaks the tests. --- dlls/oleaut32/tests/vartest.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 342133d6403..cdbb836b041 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -246,10 +246,10 @@ typedef struct IRecordInfoImpl { IRecordInfo IRecordInfo_iface; LONG ref; - void *validsrc; unsigned int recordclear; unsigned int getsize; unsigned int recordcopy; + struct __tagBRECORD *rec; } IRecordInfoImpl; static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) @@ -299,8 +299,7 @@ static HRESULT WINAPI RecordInfo_RecordClear(IRecordInfo *iface, void *data) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->recordclear++; - if(data == This->validsrc) - This->validsrc = NULL; /* not valid anymore, now that it's been cleared */ + This->rec->pvRecord = NULL; return S_OK; } @@ -308,7 +307,7 @@ static HRESULT WINAPI RecordInfo_RecordCopy(IRecordInfo *iface, void *src, void { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->recordcopy++; - ok(This->validsrc && (src == This->validsrc), "wrong src pointer %p\n", src); + ok(src == (void*)0xdeadbeef, "wrong src pointer %p\n", src); return S_OK; } @@ -431,7 +430,6 @@ static IRecordInfoImpl *get_test_recordinfo(void) rec->recordclear = 0; rec->getsize = 0; rec->recordcopy = 0; - rec->validsrc = (void *)0xdeadbeef; return rec; } @@ -769,6 +767,7 @@ static test_VariantClearImpl test_myVariantClearImpl = {{&test_VariantClear_vtbl static void test_VariantClear(void) { + struct __tagBRECORD *rec; IRecordInfoImpl *recinfo; HRESULT hres; VARIANTARG v; @@ -893,12 +892,15 @@ static void test_VariantClear(void) /* RECORD */ recinfo = get_test_recordinfo(); V_VT(&v) = VT_RECORD; - V_RECORDINFO(&v) = &recinfo->IRecordInfo_iface; - V_RECORD(&v) = recinfo->validsrc; + rec = &V_UNION(&v, brecVal); + rec->pRecInfo = &recinfo->IRecordInfo_iface; + rec->pvRecord = (void*)0xdeadbeef; recinfo->recordclear = 0; recinfo->ref = 2; + recinfo->rec = rec; hres = VariantClear(&v); ok(hres == S_OK, "ret %08lx\n", hres); + ok(rec->pvRecord == NULL, "got %p\n", rec->pvRecord); ok(recinfo->recordclear == 1, "got %d\n", recinfo->recordclear); ok(recinfo->ref == 1, "got %ld\n", recinfo->ref); IRecordInfo_Release(&recinfo->IRecordInfo_iface); @@ -906,6 +908,7 @@ static void test_VariantClear(void) static void test_VariantCopy(void) { + struct __tagBRECORD *rec; IRecordInfoImpl *recinfo; VARIANTARG vSrc, vDst; VARTYPE vt; @@ -1030,17 +1033,20 @@ static void test_VariantCopy(void) V_VT(&vDst) = VT_EMPTY; V_VT(&vSrc) = VT_RECORD; - V_RECORDINFO(&vSrc) = &recinfo->IRecordInfo_iface; - V_RECORD(&vSrc) = recinfo->validsrc; + rec = &V_UNION(&vSrc, brecVal); + rec->pRecInfo = &recinfo->IRecordInfo_iface; + rec->pvRecord = (void*)0xdeadbeef; recinfo->recordclear = 0; recinfo->recordcopy = 0; recinfo->getsize = 0; + recinfo->rec = rec; hres = VariantCopy(&vDst, &vSrc); ok(hres == S_OK, "ret %08lx\n", hres); - ok(V_RECORD(&vDst) != recinfo->validsrc && V_RECORD(&vDst) != NULL, "got %p\n", V_RECORD(&vDst)); - ok(V_RECORDINFO(&vDst) == &recinfo->IRecordInfo_iface, "got %p\n", V_RECORDINFO(&vDst)); + rec = &V_UNION(&vDst, brecVal); + ok(rec->pvRecord != (void*)0xdeadbeef && rec->pvRecord != NULL, "got %p\n", rec->pvRecord); + ok(rec->pRecInfo == &recinfo->IRecordInfo_iface, "got %p\n", rec->pRecInfo); ok(recinfo->getsize == 1, "got %d\n", recinfo->recordclear); ok(recinfo->recordcopy == 1, "got %d\n", recinfo->recordclear);

1 0