September 2021 - Wine-Commits

Alexandre Julliard : tools: Add a few helper functions for file names and extensions.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 9e3959bd9b44c17f4d2cf0449ca78c35e7d9fd66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e3959bd9b44c17f4d2cf044… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 11:13:36 2021 +0200 tools: Add a few helper functions for file names and extensions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_xftmpl.c | 11 +------- tools/makedep.c | 17 ------------ tools/sfnt2fon/sfnt2fon.c | 12 ++------ tools/tools.h | 30 ++++++++++++++++++++ tools/widl/header.c | 7 ++--- tools/widl/parser.y | 2 +- tools/widl/typelib.c | 13 ++------- tools/widl/utils.c | 29 ------------------- tools/widl/utils.h | 1 - tools/widl/widl.c | 71 +++++++++++++---------------------------------- tools/winebuild/import.c | 4 +-- tools/winebuild/main.c | 6 ++-- tools/winebuild/utils.c | 9 +----- tools/winegcc/utils.c | 14 ---------- tools/winegcc/utils.h | 1 - tools/winegcc/winegcc.c | 45 ++++++++---------------------- tools/wmc/utils.c | 26 ----------------- tools/wmc/utils.h | 2 -- tools/wmc/wmc.c | 15 ++++------ tools/wrc/po.c | 5 +--- tools/wrc/utils.c | 26 ----------------- tools/wrc/utils.h | 1 - tools/wrc/wpp.c | 8 +----- tools/wrc/wrc.c | 15 ++++------ 24 files changed, 88 insertions(+), 282 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e3959bd9b44c17f4d2c…

1 0

Huw Davies : secur32: Restore the done label.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 1f0bc618eda7bc3f6eef3271d0fce32d4f009bc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0bc618eda7bc3f6eef3271… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 29 07:53:54 2021 +0100 secur32: Restore the done label. This was incorrectly removed by commit 5c0fe4db7d580784ab6adc361bfed981be25753c. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 523f8c63562..f7f7db955ef 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1107,6 +1107,7 @@ static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session se CFRelease(data); } +done: CFRelease(cert_array); return ret; }

1 0

Alexandre Julliard : winedump: Use the shared tools functions.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 3cdc6d682ceff3568d0e77f58772a266528f2bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cdc6d682ceff3568d0e77f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 11:14:01 2021 +0200 winedump: Use the shared tools functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/debug.c | 5 +- tools/winedump/dump.c | 3 +- tools/winedump/main.c | 36 ++------- tools/winedump/misc.c | 74 +----------------- tools/winedump/msc.c | 11 +-- tools/winedump/msmangle.c | 190 +++++++++++++++++++++++----------------------- tools/winedump/nls.c | 7 +- tools/winedump/pdb.c | 5 +- tools/winedump/pe.c | 10 +-- tools/winedump/search.c | 23 +++--- tools/winedump/symbol.c | 3 +- tools/winedump/tlb.c | 5 +- tools/winedump/winedump.h | 4 - 13 files changed, 142 insertions(+), 234 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cdc6d682ceff3568d0e…

1 0

Zebediah Figura : wined3d: Call prepare_upload_bo in wined3d_device_context_emit_map() only for DISCARD or NOOVERWRITE maps.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: e906468c64498db006dd98cb726a34ef1f71a24d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e906468c64498db006dd98cb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 28 16:12:49 2021 -0500 wined3d: Call prepare_upload_bo in wined3d_device_context_emit_map() only for DISCARD or NOOVERWRITE maps. We can't do an asynchronous upload with just WINED3D_MAP_WRITE, but we can with update_sub_resource, and prepare_upload_bo doesn't know which it was called from. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2d295d4660e..77c27e6cad0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2463,7 +2463,8 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); - if ((*map_ptr = context->ops->prepare_upload_bo(context, resource, + if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + && (*map_ptr = context->ops->prepare_upload_bo(context, resource, sub_resource_idx, box, row_pitch, slice_pitch, flags, &addr))) { TRACE("Returning upload bo %s, map pointer %p, row pitch %u, slice pitch %u.\n",

1 0

Nikolay Sivov : ole32/pointermoniker: Fix argument check in GetDisplayName().
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 01feab9ef4397ce236249dbe7c0edfef4320d826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01feab9ef4397ce236249dbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 10:23:23 2021 +0300 ole32/pointermoniker: Fix argument check in GetDisplayName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/pointermoniker.c | 18 ++++++++---------- dlls/ole32/tests/moniker.c | 6 +++++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index aa4a01d9e75..051d42aca6d 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -380,19 +380,17 @@ static HRESULT WINAPI PointerMonikerImpl_RelativePathTo(IMoniker *iface, IMonike return other ? E_NOTIMPL : E_INVALIDARG; } -/****************************************************************************** - * PointerMoniker_GetDisplayName - ******************************************************************************/ -static HRESULT WINAPI -PointerMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) +static HRESULT WINAPI PointerMonikerImpl_GetDisplayName(IMoniker *iface, IBindCtx *pbc, + IMoniker *toleft, LPOLESTR *name) { - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName); + TRACE("%p, %p, %p, %p.\n", iface, pbc, toleft, name); - if (ppszDisplayName==NULL) - return E_POINTER; + if (!name || !pbc) + { + if (name) *name = NULL; + return E_INVALIDARG; + } - *ppszDisplayName = NULL; return E_NOTIMPL; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index fcd8dd8310d..a7c0714a5d7 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3689,9 +3689,13 @@ todo_wine hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + display_name = (void *)0xdeadbeef; hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &display_name); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!display_name, "Unexpected pointer.\n"); IBindCtx_Release(bindctx);

1 0

Nikolay Sivov : ole32/composite: Do not use antimoniker composition in BindToStorage().
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 5855196be9ce97c9850d395d78ddd5c79165b200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5855196be9ce97c9850d395d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 10:23:26 2021 +0300 ole32/composite: Do not use antimoniker composition in BindToStorage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 58 +++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index df9b23c515d..c6d0d3c47a6 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -372,52 +372,40 @@ static HRESULT WINAPI CompositeMonikerImpl_BindToObject(IMoniker *iface, IBindCt return hr; } -/****************************************************************************** - * CompositeMoniker_BindToStorage - ******************************************************************************/ -static HRESULT WINAPI -CompositeMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) +static HRESULT WINAPI CompositeMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx *pbc, + IMoniker *toleft, REFIID riid, void **result) { - HRESULT res; - IMoniker *tempMk,*antiMk,*rightMostMk,*leftMk; - IEnumMoniker *enumMoniker; + CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); + IMoniker *left, *rightmost, *composed_left; + HRESULT hr; - TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); + TRACE("%p, %p, %p, %s, %p.\n", iface, pbc, toleft, debugstr_guid(riid), result); - *ppvResult=0; + *result = NULL; - /* This method recursively calls BindToStorage on the rightmost component of the composite, */ - /* passing the rest of the composite as the pmkToLeft parameter for that call. */ + if (FAILED(hr = composite_get_rightmost(moniker, &left, &rightmost))) + return hr; - if (pmkToLeft) + if (toleft) { - res = IMoniker_ComposeWith(pmkToLeft, iface, FALSE, &leftMk); - if (FAILED(res)) return res; + hr = compose_with(toleft, left, &composed_left); } else - leftMk = iface; - - IMoniker_Enum(iface, FALSE, &enumMoniker); - IEnumMoniker_Next(enumMoniker, 1, &rightMostMk, NULL); - IEnumMoniker_Release(enumMoniker); - - res = CreateAntiMoniker(&antiMk); - if (FAILED(res)) return res; - res = IMoniker_ComposeWith(leftMk, antiMk, 0, &tempMk); - if (FAILED(res)) return res; - IMoniker_Release(antiMk); - - res = IMoniker_BindToStorage(rightMostMk, pbc, tempMk, riid, ppvResult); - - IMoniker_Release(tempMk); + { + composed_left = left; + IMoniker_AddRef(composed_left); + } - IMoniker_Release(rightMostMk); + if (SUCCEEDED(hr)) + { + hr = IMoniker_BindToStorage(rightmost, pbc, composed_left, riid, result); + IMoniker_Release(composed_left); + } - if (pmkToLeft) - IMoniker_Release(leftMk); + IMoniker_Release(rightmost); + IMoniker_Release(left); - return res; + return hr; } /******************************************************************************

1 0

Nikolay Sivov : ole32/composite: Cleanup IsRunning() implementation.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 0806f9531f2b3ca0782d122e74b8b75e28dca96d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0806f9531f2b3ca0782d122e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 10:23:25 2021 +0300 ole32/composite: Cleanup IsRunning() implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 93 ++++++++++++++----------------------------- dlls/ole32/tests/moniker.c | 9 +++++ 2 files changed, 39 insertions(+), 63 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 77e1e8aff35..df9b23c515d 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -612,82 +612,49 @@ static HRESULT WINAPI CompositeMonikerImpl_Hash(IMoniker *iface, DWORD *hash) return hr; } -/****************************************************************************** - * CompositeMoniker_IsRunning - ******************************************************************************/ -static HRESULT WINAPI -CompositeMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, IMoniker* pmkNewlyRunning) +static HRESULT WINAPI CompositeMonikerImpl_IsRunning(IMoniker *iface, IBindCtx *pbc, + IMoniker *toleft, IMoniker *newly_running) { - IRunningObjectTable* rot; - HRESULT res; - IMoniker *tempMk,*antiMk,*rightMostMk; - IEnumMoniker *enumMoniker; - - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning); - - /* If pmkToLeft is non-NULL, this method composes pmkToLeft with this moniker and calls IsRunning on the result.*/ - if (pmkToLeft!=NULL){ + CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); + IMoniker *c, *left, *rightmost; + IRunningObjectTable *rot; + HRESULT hr; - CreateGenericComposite(pmkToLeft,iface,&tempMk); + TRACE("%p, %p, %p, %p.\n", iface, pbc, toleft, newly_running); - res = IMoniker_IsRunning(tempMk,pbc,NULL,pmkNewlyRunning); + if (!pbc) + return E_INVALIDARG; - IMoniker_Release(tempMk); + if (toleft) + { + if (SUCCEEDED(hr = CreateGenericComposite(toleft, iface, &c))) + { + hr = IMoniker_IsRunning(c, pbc, NULL, newly_running); + IMoniker_Release(c); + } - return res; + return hr; } - else - /* If pmkToLeft is NULL, this method returns S_OK if pmkNewlyRunning is non-NULL and is equal */ - /* to this moniker */ - if (pmkNewlyRunning!=NULL) + if (newly_running) + return IMoniker_IsEqual(iface, newly_running); - if (IMoniker_IsEqual(iface,pmkNewlyRunning)==S_OK) - return S_OK; - - else - return S_FALSE; - - else{ - - if (pbc==NULL) - return E_INVALIDARG; - - /* If pmkToLeft and pmkNewlyRunning are both NULL, this method checks the ROT to see whether */ - /* the moniker is running. If so, the method returns S_OK; otherwise, it recursively calls */ - /* IMoniker::IsRunning on the rightmost component of the composite, passing the remainder of */ - /* the composite as the pmkToLeft parameter for that call. */ - - res=IBindCtx_GetRunningObjectTable(pbc,&rot); - - if (FAILED(res)) - return res; - - res = IRunningObjectTable_IsRunning(rot,iface); - IRunningObjectTable_Release(rot); - - if(res==S_OK) - return S_OK; - - else{ + if (FAILED(hr = IBindCtx_GetRunningObjectTable(pbc, &rot))) + return hr; - IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); - IEnumMoniker_Release(enumMoniker); + hr = IRunningObjectTable_IsRunning(rot, iface); + IRunningObjectTable_Release(rot); + if (hr == S_OK) return S_OK; - res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); - IMoniker_Release(antiMk); + if (FAILED(hr = composite_get_rightmost(moniker, &left, &rightmost))) + return hr; - res=IMoniker_IsRunning(rightMostMk,pbc,tempMk,pmkNewlyRunning); + hr = IMoniker_IsRunning(rightmost, pbc, left, NULL); - IMoniker_Release(tempMk); - IMoniker_Release(rightMostMk); + IMoniker_Release(left); + IMoniker_Release(rightmost); - return res; - } - } + return hr; } static HRESULT WINAPI CompositeMonikerImpl_GetTimeOfLastChange(IMoniker *iface, IBindCtx *pbc, diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 2d7f0789924..ea58c09356e 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3273,6 +3273,15 @@ todo_wine hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsRunning(moniker, bindctx, moniker1, moniker); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsRunning(moniker, NULL, moniker1, moniker); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); ok(hr == MK_E_NOTBINDABLE, "IMoniker_GetTimeOfLastChange should return MK_E_NOTBINDABLE, not 0x%08x\n", hr);

1 0

Ziqing Hui : d2d1/tests: Add tests for 2D affine effect.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 57d5314ad6d4aaa2e484aaeca09364074a072f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d5314ad6d4aaa2e484aaec… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Sep 28 21:34:47 2021 +0800 d2d1/tests: Add tests for 2D affine effect. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d38d49cd139..4beba7c963a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9897,6 +9897,154 @@ static void test_effect(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_2d_affine(BOOL d3d11) +{ + D2D1_MATRIX_3X2_F rotate, scale, skew; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + D2D_RECT_F output_bounds = {0}; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + unsigned int i, x, y, w, h; + D2D1_SIZE_U input_size; + ID2D1Factory1 *factory; + D2D1_POINT_2F offset; + ID2D1Bitmap1 *bitmap; + ID2D1Effect *effect; + ID2D1Image *output; + BOOL match; + HRESULT hr; + + static const DWORD image_4x4[] = + { + 0xfdcba987, 0xffff0000, 0x98765432, 0xffffffff, + 0x4b4b4b4b, 0x89abcdef, 0xdeadbeef, 0xabcdef01, + 0x7f000011, 0x40ffffff, 0x12345678, 0xaabbccdd, + 0x44444444, 0xff7f7f7f, 0x1221abba, 0x00000000 + }; + DWORD image_16x16[16 * 16]; + + const struct effect_2d_affine_test + { + const DWORD *img_data; + unsigned int img_width; + unsigned int img_height; + + D2D1_MATRIX_3X2_F *matrix; + + D2D_RECT_F bounds; + const char *figure; + } + effect_2d_affine_tests[] = + { + {image_4x4, 4, 4, &rotate, {-6.0f, -3.0f, 2.0f, 4.0f}, + "ASgBAQkBAQEBBwEBAQEBAQYBAQEBAQEHAQEBASgA"}, + {image_4x4, 4, 4, &scale, {-2.0f, -3.0f, 1.0f, 9.0f}, + "AQ8BAQEEAQEBBAEBAQQBAQEEAQEBBAEBAQQBAQEEAQEBBAEBAQQBAQEEAQEBBAEBARAA/"}, + {image_4x4, 4, 4, &skew, {-7.0f, -3.0f, 3.0f, 7.0f}, + "AS8CCwEBAQEJAQEBAQEBBwEBAQEBAQEBBgEBAQEBAQEBBwEBAQEBAQkCAj0A"}, + {image_16x16, 16, 16, &rotate, {-14.0f, -3.0f, 10.0f, 21.0f}, + "AWACGQECARcBBAEVAQYBEwEIAREBCgEPAQwBDQEOAQsBEAEJARIBBwEUAQUBARQBAQUBARIBAQcB" + "ARABAQkBAQ4BAQsBAQwBAQ0BAQoBAQ8BAQgBAREBAQYBARMBAQQBARUBAQIBARcBAgEZAkUA"}, + {image_16x16, 16, 16, &scale, {-2.0f, -3.0f, 10.0f, 39.0f}, + "ASEMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQM" + "BAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDCIA"}, + {image_16x16, 16, 16, &skew, {-19.0f, -3.0f, 15.0f, 31.0f}, + "AYMBAiMBAgEhAQQBHwEGAR0BCAEbAQoBGQEMARcBDgEVARABEwESAREBFAEPARYBDQEYAQsBGgEJ" + "ARwBBwEeAQYBHgEHARwBCQEaAQsBGAENARYBDwEUAREBEgETARABFQEOARcBDAEZAQoBGwEIAR0B" + "BgEfAQQBIQECASMChAEA"}, + }; + + memset(image_16x16, 0xff, sizeof(image_16x16)); + set_matrix_identity(&rotate); + set_matrix_identity(&scale); + set_matrix_identity(&skew); + translate_matrix(&rotate, -2.0f, -2.0f); + translate_matrix(&scale, -2.0f, -2.0f); + translate_matrix(&skew, -2.0f, -2.0f); + rotate_matrix(&rotate, M_PI_4); + scale_matrix(&scale, 0.75f, 2.5f); + skew_matrix(&skew, -1.0f, 1.0f); + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(effect_2d_affine_tests); ++i) + { + const struct effect_2d_affine_test *test = &effect_2d_affine_tests[i]; + winetest_push_context("Test %u", i); + + set_size_u(&input_size, test->img_width, test->img_height); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(context, input_size, test->img_data, + sizeof(*test->img_data) * test->img_width, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE); + todo_wine + hr = ID2D1Effect_SetValue(effect, D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX, + D2D1_PROPERTY_TYPE_MATRIX_3X2, (const BYTE *)test->matrix, sizeof(*test->matrix)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1Effect_GetOutput(effect, &output); + + ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); + todo_wine + ok(compare_rect(&output_bounds, test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom, 1), + "Got unexpected output bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + output_bounds.left, output_bounds.top, output_bounds.right, output_bounds.bottom, + test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom); + if (output_bounds.left == output_bounds.right || output_bounds.top == output_bounds.bottom) + { + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + continue; + } + + ID2D1DeviceContext_BeginDraw(context); + ID2D1DeviceContext_Clear(context, 0); + offset.x = 320.0f; + offset.y = 240.0f; + ID2D1DeviceContext_DrawImage(context, output, &offset, NULL, 0, 0); + hr = ID2D1DeviceContext_EndDraw(context, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + x = offset.x + output_bounds.left - 2.0f; + y = offset.y + output_bounds.top - 2.0f; + w = (output_bounds.right - output_bounds.left) + 4.0f; + h = (output_bounds.bottom - output_bounds.top) + 4.0f; + match = compare_figure(&ctx, x, y, w, h, 0xff652e89, 0, test->figure); + todo_wine + ok(match, "Figure does not match.\n"); + + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + } + + ID2D1Effect_Release(effect); + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9959,6 +10107,7 @@ START_TEST(d2d1) queue_test(test_geometry_group); queue_test(test_mt_factory); queue_test(test_effect); + queue_test(test_effect_2d_affine); run_queued_tests(); }

1 0

Zebediah Figura : wined3d: Wrap the upload bo address in a new upload_bo structure.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: e06f52eb00ac9ac33e0d5399147ce6d5a8441427 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e06f52eb00ac9ac33e0d5399… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 28 16:12:50 2021 -0500 wined3d: Wrap the upload bo address in a new upload_bo structure. 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 | 58 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 9 +++++-- 2 files changed, 36 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e06f52eb00ac9ac33e0d…

1 0

Alex Henrie : ws2_32/tests: Add tests for IPv4 control messages.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 77f07a0da23b82ceed4c1caae80d5d70037bf62b URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f07a0da23b82ceed4c1caa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 29 00:40:53 2021 -0600 ws2_32/tests: Add tests for IPv4 control messages. IP_PKTINFO already had tests, but it doesn't hurt to add a few more. IP_RECVTTL and IP_RECVTCLASS didn't have any tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ec8a3b0481b..d42c1c1ffbc 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1984,6 +1984,125 @@ static void test_ip_pktinfo(void) CloseHandle(ov.hEvent); } +static void test_ipv4_cmsg(void) +{ + static const DWORD off = 0; + static const DWORD on = 1; + SOCKADDR_IN localhost = {0}; + SOCKET client, server; + char payload[] = "HELLO"; + char control[100]; + WSABUF payload_buf = {sizeof(payload), payload}; + WSAMSG msg = {NULL, 0, &payload_buf, 1, {sizeof(control), control}, 0}; + WSACMSGHDR *header = (WSACMSGHDR *)control; + LPFN_WSARECVMSG pWSARecvMsg; + INT *int_data = (INT *)WSA_CMSG_DATA(header); + IN_PKTINFO *pkt_info = (IN_PKTINFO *)WSA_CMSG_DATA(header); + DWORD count, state; + int rc; + + localhost.sin_family = AF_INET; + localhost.sin_port = htons(SERVERPORT); + inet_pton(AF_INET, "127.0.0.1", &localhost.sin_addr); + + client = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ok(client != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + server = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + + rc = bind(server, (SOCKADDR *)&localhost, sizeof(localhost)); + ok(rc != SOCKET_ERROR, "bind failed, error %u\n", WSAGetLastError()); + rc = connect(client, (SOCKADDR *)&localhost, sizeof(localhost)); + ok(rc != SOCKET_ERROR, "connect failed, error %u\n", WSAGetLastError()); + + rc = WSAIoctl(server, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSARecvMsg_GUID, sizeof(WSARecvMsg_GUID), + &pWSARecvMsg, sizeof(pWSARecvMsg), &count, NULL, NULL); + ok(!rc, "failed to get WSARecvMsg, error %u\n", WSAGetLastError()); + + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IP, IP_RECVTTL, (const char *)&on, sizeof(on)); +todo_wine + ok(!rc, "failed to set IP_RECVTTL, error %u\n", WSAGetLastError()); + state = 0; + count = sizeof(state); + rc = getsockopt(server, IPPROTO_IP, IP_RECVTTL, (char *)&state, (INT *)&count); +todo_wine + ok(!rc, "failed to get IP_RECVTTL, error %u\n", WSAGetLastError()); +todo_wine + ok(state == 1, "expected 1, got %u\n", state); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %Iu, got %u\n", sizeof(payload), count); + ok(header->cmsg_level == IPPROTO_IP, "expected IPPROTO_IP, got %i\n", header->cmsg_level); +todo_wine + ok(header->cmsg_type == IP_TTL || broken(header->cmsg_type == IP_HOPLIMIT) /* <= win10 v1607 */, + "expected IP_TTL, got %i\n", header->cmsg_type); +todo_wine + ok(header->cmsg_len == sizeof(*header) + sizeof(INT), + "expected length %Iu, got %Iu\n", sizeof(*header) + sizeof(INT), header->cmsg_len); +todo_wine + ok(*int_data >= 32, "expected at least 32, got %i\n", *int_data); + setsockopt(server, IPPROTO_IP, IP_RECVTTL, (const char *)&off, sizeof(off)); + ok(!rc, "failed to clear IP_RECVTTL, error %u\n", WSAGetLastError()); + + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IP, IP_PKTINFO, (const char *)&on, sizeof(on)); + ok(!rc, "failed to set IP_PKTINFO, error %u\n", WSAGetLastError()); + state = 0; + count = sizeof(state); + rc = getsockopt(server, IPPROTO_IP, IP_PKTINFO, (char *)&state, (INT *)&count); + ok(!rc, "failed to get IP_PKTINFO, error %u\n", WSAGetLastError()); + ok(state == 1, "expected 1, got %u\n", state); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %Iu, got %u\n", sizeof(payload), count); + ok(header->cmsg_level == IPPROTO_IP, "expected IPPROTO_IP, got %i\n", header->cmsg_level); + ok(header->cmsg_type == IP_PKTINFO, "expected IP_PKTINFO, got %i\n", header->cmsg_type); + ok(header->cmsg_len == sizeof(*header) + sizeof(IN_PKTINFO), + "expected length %Iu, got %Iu\n", sizeof(*header) + sizeof(IN_PKTINFO), header->cmsg_len); + ok(!memcmp(&pkt_info->ipi_addr, &localhost.sin_addr, sizeof(IN_ADDR)), "expected 127.0.0.1\n"); + rc = setsockopt(server, IPPROTO_IP, IP_PKTINFO, (const char *)&off, sizeof(off)); + ok(!rc, "failed to clear IP_PKTINFO, error %u\n", WSAGetLastError()); + + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IP, IP_RECVTCLASS, (const char *)&on, sizeof(on)); +todo_wine + ok(!rc, "failed to set IP_RECVTCLASS, error %u\n", WSAGetLastError()); + state = 0; + count = sizeof(state); + rc = getsockopt(server, IPPROTO_IP, IP_RECVTCLASS, (char *)&state, (INT *)&count); +todo_wine + ok(!rc, "failed to get IP_RECVTCLASS, error %u\n", WSAGetLastError()); +todo_wine + ok(state == 1, "expected 1, got %u\n", state); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %Iu, got %u\n", sizeof(payload), count); + ok(header->cmsg_level == IPPROTO_IP, "expected IPPROTO_IP, got %i\n", header->cmsg_level); +todo_wine + ok(header->cmsg_type == IP_TOS || broken(header->cmsg_type == IP_TCLASS) /* <= win10 v1607 */, + "expected IP_TOS, got %i\n", header->cmsg_type); +todo_wine + ok(header->cmsg_len == sizeof(*header) + sizeof(INT), + "expected length %Iu, got %Iu\n", sizeof(*header) + sizeof(INT), header->cmsg_len); + ok(*int_data == 0, "expected 0, got %i\n", *int_data); + rc = setsockopt(server, IPPROTO_IP, IP_RECVTCLASS, (const char *)&off, sizeof(off)); +todo_wine + ok(!rc, "failed to clear IP_RECVTCLASS, error %u\n", WSAGetLastError()); + + closesocket(server); + closesocket(client); +} + static void test_ipv6_cmsg(void) { static const DWORD off = 0; @@ -11767,6 +11886,7 @@ START_TEST( sock ) test_set_getsockopt(); test_so_reuseaddr(); test_ip_pktinfo(); + test_ipv4_cmsg(); test_ipv6_cmsg(); test_extendedSocketOptions(); test_so_debug();

1 0