February 2022 - Wine-Commits

Tag wine-7.2 : Alexandre Julliard : Release 7.2
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: refs/tags/wine-7.2 Tag: 6a236ac29be0f34da5fc7757103dd446e17da051 URL: https://source.winehq.org/git/wine.git/?a=tag;h=6a236ac29be0f34da5fc7757103… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 11 21:32:05 2022 +0100 Release 7.2

1 0

Bernhard Kölbl : include/windows.foundation.idl: Add IAsyncAction interface.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: f89774a79f1c72e71a2d38d7154bc64ca1a08562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f89774a79f1c72e71a2d38d7… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Jan 31 13:51:46 2022 +0100 include/windows.foundation.idl: Add IAsyncAction interface. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 292522f2c49..a4ee7303ddb 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -27,6 +27,12 @@ import "windowscontracts.idl"; /* import "ivectorchangedeventargs.idl"; */ import "windows.foundation.collections.idl"; +namespace Windows { + namespace Foundation { + interface IAsyncAction; + } +} + namespace Windows { namespace Foundation { typedef enum PropertyType PropertyType; @@ -36,6 +42,12 @@ namespace Windows { typedef struct DateTime DateTime; typedef struct TimeSpan TimeSpan; + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(a4ed5c81-76c9-40bd-8be6-b1d90fb20ae7) + ] + delegate HRESULT AsyncActionCompletedHandler([in] Windows.Foundation.IAsyncAction *action, [in] AsyncStatus status); + [contract(Windows.Foundation.FoundationContract, 1.0)] enum PropertyType { Empty = 0, @@ -128,6 +140,18 @@ namespace Windows { { HRESULT Close(); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(5a648006-843a-4da9-865b-9d26e5dfad7b) + ] + interface IAsyncAction : IInspectable + requires IAsyncInfo + { + [propput] HRESULT Completed([in] Windows.Foundation.AsyncActionCompletedHandler *handler); + [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncActionCompletedHandler **handler); + HRESULT GetResults(); + } } }

1 0

Bernhard Kölbl : include/windows.foundation.collections.idl: Add IVector<T> interface.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: d3f51b1d28994b48afcc94932ccd9c49a1129b54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f51b1d28994b48afcc9493… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Jan 31 13:51:45 2022 +0100 include/windows.foundation.collections.idl: Add IVector<T> interface. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 876e15336a2..a2d2d75ec4f 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -118,6 +118,26 @@ cpp_quote("#endif") HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value); HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(913337e9-11a1-4345-a3a2-4e7f956e222d) + ] + interface IVector<T> : IInspectable + { + HRESULT GetAt([in, optional] UINT32 index, [out, retval] T *value); + [propget] HRESULT Size([out, retval] UINT32 *value); + HRESULT GetView([out, retval] IVectorView<T> **value); + HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value); + HRESULT SetAt([in] UINT32 index, [in, optional] T value); + HRESULT InsertAt([in] UINT32 index, [in, optional] T value); + HRESULT RemoveAt([in] UINT32 index); + HRESULT Append([in, optional] T value); + HRESULT RemoveAtEnd(); + HRESULT Clear(); + HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); + HRESULT ReplaceAll([in] UINT32 count, [in] T *items); + } } #endif }

1 0

Piotr Caban : msvcp60: Remove basic_streambuf<wchar> code.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 4f8afca784551e483c576fee9d9e5e44dadf9a90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f8afca784551e483c576fee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 14:17:43 2022 +0100 msvcp60: Remove basic_streambuf<wchar> code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 188 ++++++++++++++-------------------------------- dlls/msvcp60/msvcp60.spec | 44 +++++------ 2 files changed, 80 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f8afca784551e483c57…

1 0

Piotr Caban : msvcp60: Remove basic_ostream<wchar> code.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 85243c6ca7579218a90f536255935ac63669ea5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=85243c6ca7579218a90f5362… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 14:17:40 2022 +0100 msvcp60: Remove basic_ostream<wchar> code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 686 ++++++++++++++-------------------------------- dlls/msvcp60/msvcp60.spec | 88 +++--- 2 files changed, 256 insertions(+), 518 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85243c6ca7579218a90f…

1 0

Jactry Zeng : d2d1: Implement d2d_bitmap_CopyFromBitmap().
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 1a3921475c304566b549366ed9007bb2aeb7f48a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a3921475c304566b549366e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Feb 11 01:51:52 2022 -0600 d2d1: Implement d2d_bitmap_CopyFromBitmap(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 28 ++++++++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 50744836b13..971e3c7ff6b 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -133,9 +133,33 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap1 *iface, float *dpi_ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap1 *iface, const D2D1_POINT_2U *dst_point, ID2D1Bitmap *bitmap, const D2D1_RECT_U *src_rect) { - FIXME("iface %p, dst_point %p, bitmap %p, src_rect %p stub!\n", iface, dst_point, bitmap, src_rect); + struct d2d_bitmap *src_bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); + struct d2d_bitmap *dst_bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11DeviceContext *context; + ID3D11Device *device; + D3D11_BOX box; - return E_NOTIMPL; + TRACE("iface %p, dst_point %p, bitmap %p, src_rect %p.\n", iface, dst_point, bitmap, src_rect); + + if (src_rect) + { + box.left = src_rect->left; + box.top = src_rect->top; + box.front = 0; + box.right = src_rect->right; + box.bottom = src_rect->bottom; + box.back = 1; + } + + ID3D11Resource_GetDevice(dst_bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_CopySubresourceRegion(context, dst_bitmap->resource, 0, + dst_point ? dst_point->x : 0, dst_point ? dst_point->y : 0, 0, + src_bitmap->resource, 0, src_rect ? &box : NULL); + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap1 *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ba67dd53111..b3691d91173 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4802,10 +4802,11 @@ static void test_shared_bitmap(BOOL d3d11) static void test_bitmap_updates(BOOL d3d11) { D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1Bitmap *bitmap, *dst_bitmap; + D2D1_RECT_U dst_rect, src_rect; struct d2d1_test_context ctx; + D2D1_POINT_2U dst_point; ID2D1RenderTarget *rt; - D2D1_RECT_U dst_rect; - ID2D1Bitmap *bitmap; D2D1_COLOR_F color; D2D1_RECT_F rect; D2D1_SIZE_U size; @@ -4883,6 +4884,40 @@ static void test_bitmap_updates(BOOL d3d11) match = compare_surface(&ctx, "cb8136c91fbbdc76bb83b8c09edc1907b0a5d0a6"); ok(match, "Surface does not match.\n"); + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &dst_bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, NULL, bitmap, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + dst_point.x = 1; dst_point.y = 1; + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, &dst_point, bitmap, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + dst_point.x = 0; dst_point.y = 1; + set_rect_u(&src_rect, 1, 1, 3, 3); + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, &dst_point, bitmap, &src_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + dst_point.x = 1; dst_point.y = 0; + set_rect_u(&src_rect, 2, 2, 1, 1); + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, &dst_point, bitmap, &src_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + set_rect_u(&src_rect, 1, 1, 2, 2); + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, NULL, bitmap, &src_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_rect(&rect, 320.0f, 0.0f, 640.0f, 240.0f); + ID2D1RenderTarget_DrawBitmap(rt, dst_bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "a1758bd644d897f75d43769ba26456af70cd9056"); + ok(match, "Surface does not match.\n"); + ID2D1Bitmap_Release(dst_bitmap); + ID2D1Bitmap_Release(bitmap); release_test_context(&ctx); }

1 0

Piotr Caban : msvcp60: Remove basic_streambuf<wchar> code.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: a67d74483ddbc997b4341fd6103bb659d381dbec URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67d74483ddbc997b4341fd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 14:17:49 2022 +0100 msvcp60: Remove basic_streambuf<wchar> code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 164 ++--------------------------------------------------- 1 file changed, 6 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a67d74483ddbc997b434…

1 0

Piotr Caban : msvcp60: Remove basic_filebuf<wchar> code.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: ae3cb1fc19704aae4e415692130c04bd29163bec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae3cb1fc19704aae4e415692… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 14:17:45 2022 +0100 msvcp60: Remove basic_filebuf<wchar> code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 339 +++++++++++----------------------------------- dlls/msvcp60/msvcp60.spec | 52 +++---- 2 files changed, 105 insertions(+), 286 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae3cb1fc19704aae4e41…

1 0

Piotr Caban : msvcp60: Add missing exports.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 98032eeab5fe02de7802f79ef18ab0a5e93f91fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=98032eeab5fe02de7802f79e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 14:17:59 2022 +0100 msvcp60: Add missing exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 9 +++++---- dlls/msvcp60/msvcp60.spec | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 4db279d2cfe..e91de638827 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -4114,11 +4114,12 @@ bool __thiscall ios_base_operator_bool(const ios_base *this) return (this->state & (IOSTATE_failbit|IOSTATE_badbit)) == 0; } -/* ?_Addstd(a)ios_base@std@@SAXPAV12@@Z */ -/* ?_Addstd(a)ios_base@std@@SAXPEAV12@@Z */ -void __cdecl ios_base_Addstd(ios_base *add) +/* ?_Addstd(a)ios_base@std@@IAEXXZ */ +/* ?_Addstd(a)ios_base@std@@IEAAXXZ */ +DEFINE_THISCALL_WRAPPER(ios_base_Addstd, 4) +void __thiscall ios_base_Addstd(ios_base *this) { - FIXME("(%p) stub\n", add); + FIXME("(%p) stub\n", this); } /* ?_Index_func(a)ios_base@std@@CAAAHXZ */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 092ccf1a1d3..1cea4d6f189 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2001,8 +2001,8 @@ @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) _Locinfo__Addcats @ thiscall -arch=win32 ?_Addfac(a)locale@std@@QAEAAV12(a)PAVfacet@12(a)II@Z(ptr ptr long long) locale__Addfac @ cdecl -arch=win64 ?_Addfac(a)locale@std@@QEAAAEAV12(a)PEAVfacet@12(a)_K1@Z(ptr ptr long long) locale__Addfac -@ stub -arch=win32 ?_Addstd(a)ios_base@std@@IAEXXZ -@ stub -arch=win64 ?_Addstd(a)ios_base@std@@IEAAXXZ +@ thiscall -arch=win32 ?_Addstd(a)ios_base@std@@IAEXXZ(ptr) ios_base_Addstd +@ cdecl -arch=win64 ?_Addstd(a)ios_base@std@@IEAAXXZ(ptr) ios_base_Addstd @ extern -arch=win32 ?_C@?1??_Nullstr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@CAPBDXZ(a)4DB basic_string_char_nullbyte @ extern -arch=win64 ?_C@?1??_Nullstr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@CAPEBDXZ(a)4DB basic_string_char_nullbyte @ extern -arch=win32 ?_C@?1??_Nullstr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@CAPBGXZ(a)4GB basic_string_wchar_nullbyte @@ -2503,16 +2503,16 @@ @ cdecl -arch=win64 ?classic(a)locale@std@@SAAEBV12(a)XZ() locale_classic @ cdecl -arch=win32 ?classic_table@?$ctype(a)D@std@@KAPBFXZ() ctype_char_classic_table @ cdecl -arch=win64 ?classic_table@?$ctype(a)D@std@@KAPEBFXZ() ctype_char_classic_table -@ stub -arch=win32 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXF(a)Z -@ stub -arch=win64 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXF(a)Z(ptr long) basic_ios_char_clear +@ cdecl -arch=win64 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXF(a)Z(ptr long) basic_ios_char_clear @ thiscall -arch=win32 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_char_clear_reraise @ cdecl -arch=win64 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_char_clear_reraise -@ stub -arch=win32 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXF(a)Z -@ stub -arch=win64 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXF(a)Z(ptr long) basic_ios_short_clear +@ cdecl -arch=win64 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXF(a)Z(ptr long) basic_ios_short_clear @ thiscall -arch=win32 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_short_clear_reraise @ cdecl -arch=win64 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_short_clear_reraise -@ stub -arch=win32 ?clear(a)ios_base@std@@QAEXF(a)Z -@ stub -arch=win64 ?clear(a)ios_base@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXF(a)Z(ptr long) ios_base_clear +@ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXF(a)Z(ptr long) ios_base_clear @ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXH_N(a)Z(ptr long long) ios_base_clear_reraise @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @@ -3930,14 +3930,14 @@ @ cdecl -arch=win64 ?seekoff@?$basic_stringbuf(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@MEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_stringbuf_short_seekoff @ thiscall -arch=win32 ?seekoff(a)strstreambuf@std@@MAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) strstreambuf_seekoff @ cdecl -arch=win64 ?seekoff(a)strstreambuf@std@@MEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) strstreambuf_seekoff -@ stub -arch=win32 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z +@ thiscall -arch=win32 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_ostream_char_seekp @ cdecl -arch=win64 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z(ptr ptr) basic_ostream_char_seekp_fpos @ thiscall -arch=win32 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z(ptr long long int64 long long) basic_ostream_char_seekp_fpos -@ stub -arch=win64 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z -@ stub -arch=win32 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z +@ cdecl -arch=win64 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_ostream_char_seekp +@ thiscall -arch=win32 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_ostream_short_seekp @ cdecl -arch=win64 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z(ptr ptr) basic_ostream_short_seekp_fpos @ thiscall -arch=win32 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z(ptr long long int64 long long) basic_ostream_short_seekp_fpos -@ stub -arch=win64 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z +@ cdecl -arch=win64 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_ostream_short_seekp @ thiscall -arch=win32 ?seekpos@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAE?AV?$fpos(a)H@2(a)V32@H(a)Z(ptr ptr long long int64 long long long) basic_filebuf_char_seekpos @ cdecl -arch=win64 ?seekpos@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAA?AV?$fpos(a)H@2(a)V32@H(a)Z(ptr ptr ptr long) basic_filebuf_char_seekpos @ thiscall -arch=win32 ?seekpos@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAE?AV?$fpos(a)H@2(a)V32@H(a)Z(ptr ptr long long int64 long long long) basic_filebuf_short_seekpos @@ -3980,16 +3980,16 @@ @ cdecl -arch=win64 ?setp@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXPEAG0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp @ cdecl -arch=win32 ?setprecision(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z(ptr long) setprecision @ cdecl -arch=win64 ?setprecision(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr long) setprecision -@ stub -arch=win32 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXF(a)Z -@ stub -arch=win64 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXF(a)Z(ptr long) basic_ios_char_setstate +@ cdecl -arch=win64 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXF(a)Z(ptr long) basic_ios_char_setstate @ thiscall -arch=win32 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @ cdecl -arch=win64 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise -@ stub -arch=win32 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXF(a)Z -@ stub -arch=win64 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXF(a)Z(ptr long) basic_ios_short_setstate +@ cdecl -arch=win64 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXF(a)Z(ptr long) basic_ios_short_setstate @ thiscall -arch=win32 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_short_setstate_reraise @ cdecl -arch=win64 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_short_setstate_reraise -@ stub -arch=win32 ?setstate(a)ios_base@std@@QAEXF(a)Z -@ stub -arch=win64 ?setstate(a)ios_base@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?setstate(a)ios_base@std@@QAEXF(a)Z(ptr long) ios_base_setstate +@ cdecl -arch=win64 ?setstate(a)ios_base@std@@QEAAXF(a)Z(ptr long) ios_base_setstate @ thiscall -arch=win32 ?setstate(a)ios_base@std@@QAEXH_N(a)Z(ptr long long) ios_base_setstate_reraise @ cdecl -arch=win64 ?setstate(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_setstate_reraise @ cdecl -arch=win32 ?setw(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z(ptr long) setw

1 0

Zebediah Figura : wined3d: Always submit UPDATE_SUB_RESOURCE ops when uploading if not mapping persistently.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 626dc29ae2b0ccee93539959f2070df1407a36c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=626dc29ae2b0ccee93539959… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 19:02:36 2022 -0600 wined3d: Always submit UPDATE_SUB_RESOURCE ops when uploading if not mapping persistently. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ffa0689e5a4..27a597d0b74 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3113,7 +3113,10 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str if (bo) { map_ptr += bo->memory_offset; - if (!bo->coherent) + /* If we are not mapping all buffers persistently, use + * UPDATE_SUB_RESOURCE as a means of telling the CS thread to try + * to unmap the resource, so that we can free VA space. */ + if (!bo->coherent || !wined3d_map_persistent()) client->mapped_upload.flags |= UPLOAD_BO_UPLOAD_ON_UNMAP; } map_desc->data = resource_offset_map_pointer(resource, sub_resource_idx, map_ptr, box);

1 0