August 2019 - Wine-Devel - list.winehq.org

Re: [PATCH 1/2] d3d9/tests: Test stencil reference truncation.
by Paul Gofman Aug. 21, 2019

Aug. 21, 2019

I am sorry, this was not meant as a patch suggested for upstream, I just attached a patch to a message to mailing list for reference (the message was sent as a reply to another patch). I now realize I should not do that not to mess up things. On 8/21/19 22:39, Marvin wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch. >

1 0

[PATCH 2/4] vbscript: Return correct error when builtin call argument count is invalid.
by Jacek Caban Aug. 21, 2019

Aug. 21, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/api.vbs | 22 ++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-)

1 0

[PATCH 1/4] vbscript/tests: Fix tests on recent win10.
by Jacek Caban Aug. 21, 2019

Aug. 21, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/run.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH] gdiplus: Add GdipRecordMetafileStreamI().
by Nikolay Sivov Aug. 21, 2019

Aug. 21, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 21 +++++++++++++++++++++ include/gdiplusflat.h | 5 +++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ed9d50c058..ee28b0ea4a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -451,7 +451,7 @@ 451 stdcall GdipRecordMetafileFileNameI(wstr long long ptr long wstr ptr) 452 stdcall GdipRecordMetafileI(long long ptr long wstr ptr) 453 stdcall GdipRecordMetafileStream(ptr long long ptr long wstr ptr) -454 stub GdipRecordMetafileStreamI +454 stdcall GdipRecordMetafileStreamI(ptr long long ptr long wstr ptr) 455 stdcall GdipReleaseDC(ptr ptr) 456 stdcall GdipRemovePropertyItem(ptr long) 457 stdcall GdipResetClip(ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 47d5ac5de1..a292483c14 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -859,6 +859,27 @@ GpStatus WINGDIPAPI GdipRecordMetafileI(HDC hdc, EmfType type, GDIPCONST GpRect return GdipRecordMetafile(hdc, type, pFrameRectF, frameUnit, desc, metafile); } +GpStatus WINGDIPAPI GdipRecordMetafileStreamI(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRect *frameRect, + MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) +{ + GpRectF frameRectF, *pFrameRectF; + + TRACE("(%p %p %d %p %d %p %p)\n", stream, hdc, type, frameRect, frameUnit, desc, metafile); + + if (frameRect) + { + frameRectF.X = frameRect->X; + frameRectF.Y = frameRect->Y; + frameRectF.Width = frameRect->Width; + frameRectF.Height = frameRect->Height; + pFrameRectF = &frameRectF; + } + else + pFrameRectF = NULL; + + return GdipRecordMetafileStream(stream, hdc, type, pFrameRectF, frameUnit, desc, metafile); +} + GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 57fa6c64f2..1e26c0a9d5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -284,8 +284,6 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR*,HDC,EmfType, GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR*,HDC,EmfType, GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); -GpStatus WINGDIPAPI GdipRecordMetafileI(HDC,EmfType,GDIPCONST GpRect*, - MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC); GpStatus WINGDIPAPI GdipResetClip(GpGraphics*); GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics*); @@ -549,6 +547,9 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*); GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); +GpStatus WINGDIPAPI GdipRecordMetafileI(HDC,EmfType,GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); +GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream*,HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR *,GpMetafile**); +GpStatus WINGDIPAPI GdipRecordMetafileStreamI(IStream*,HDC,EmfType,GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR *,GpMetafile**); /* MetafileHeader */ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE,MetafileHeader*); -- 2.23.0.rc1

2 1

[PATCH 5/5] jscript: Fix Object.defineProperty return value.
by Jacek Caban Aug. 21, 2019

Aug. 21, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 2 ++ dlls/mshtml/tests/es5.js | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-)

2 1

[PATCH 1/5] widl: Generate a name for the encapsulated union type.
by Zebediah Figura Aug. 21, 2019

Aug. 21, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/parser.y | 3 +-- tools/widl/typetree.c | 2 +- tools/widl/typetree.h | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 072e138ecf..8496109299 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -82,7 +82,6 @@ static var_t *reg_const(var_t *var); static void push_namespace(const char *name); static void pop_namespace(const char *name); -static char *gen_name(void); static void check_arg_attrs(const var_t *arg); static void check_statements(const statement_list_t *stmts, int is_inside_library); static void check_all_user_types(const statement_list_t *stmts); @@ -2033,7 +2032,7 @@ var_t *find_const(const char *name, int f) return cur->var; } -static char *gen_name(void) +char *gen_name(void) { static const char format[] = "__WIDL_%s_generated_name_%08lX"; static unsigned long n = 0; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 524d00571f..e9afc6fdd2 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -366,7 +366,7 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio { if (!union_field) union_field = make_var(xstrdup("tagged_union")); - union_field->declspec.type = type_new_nonencapsulated_union(NULL, TRUE, cases); + union_field->declspec.type = type_new_nonencapsulated_union(gen_name(), TRUE, cases); t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = append_var(NULL, switch_field); diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index f025f25e59..e288c57400 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -51,6 +51,7 @@ void type_module_define(type_t *module, statement_list_t *stmts); type_t *type_coclass_define(type_t *coclass, ifref_list_t *ifaces); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type); +char *gen_name(void); /* FIXME: shouldn't need to export this */ type_t *duptype(type_t *t, int dupname); -- 2.22.0

1 4

[PATCH] mscoree: Add a test to show that first non-default domain is not made current automatically.
by Nikolay Sivov Aug. 21, 2019

Aug. 21, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 22 ++++++++++++++++++++-- dlls/mscoree/tests/mscoree.c | 18 +++++++++++++++++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 2ccc7bc4f5..d2e4bc8496 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -793,8 +793,26 @@ static HRESULT WINAPI corruntimehost_CurrentDomain( ICorRuntimeHost* iface, IUnknown **appDomain) { - FIXME("stub %p\n", iface); - return E_NOTIMPL; + RuntimeHost *This = impl_from_ICorRuntimeHost(iface); + MonoDomain *prev_domain, *default_domain; + HRESULT hr; + + TRACE("(%p, %p)\n", iface, appDomain); + + if (!is_mono_started) + return E_FAIL; + + hr = RuntimeHost_GetDefaultDomain(This, NULL, &default_domain); + if (FAILED(hr)) + return hr; + + prev_domain = domain_attach(default_domain); + + hr = RuntimeHost_GetIUnknownForDomain(This, default_domain, appDomain); + + domain_restore(prev_domain); + + return hr; } static const struct ICorRuntimeHostVtbl corruntimehost_vtbl = diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index bb2a17046b..82dbb3066b 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -540,7 +540,7 @@ static void test_createdomain(void) ICLRRuntimeInfo *runtimeinfo; ICorRuntimeHost *runtimehost; IUnknown *domain, *defaultdomain_unk, *defaultdomain, *newdomain_unk, *newdomain, *domainsetup, - *newdomain2_unk, *newdomain2; + *newdomain2_unk, *newdomain2, *current_domain; HRESULT hr; if (!pCLRCreateInstance) @@ -559,12 +559,20 @@ static void test_createdomain(void) (void **)&runtimehost); ok(SUCCEEDED(hr), "ICLRRuntimeInfo::GetInterface failed, hr=%#.8x\n", hr); + hr = ICorRuntimeHost_CurrentDomain(runtimehost, &current_domain); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + hr = ICorRuntimeHost_Start(runtimehost); ok(SUCCEEDED(hr), "ICorRuntimeHost::Start failed, hr=%#.8x\n", hr); hr = ICorRuntimeHost_GetDefaultDomain(runtimehost, &domain); ok(SUCCEEDED(hr), "ICorRuntimeHost::GetDefaultDomain failed, hr=%#.8x\n", hr); + hr = ICorRuntimeHost_CurrentDomain(runtimehost, &current_domain); + ok(SUCCEEDED(hr), "Failed to get current domain, hr %#x.\n", hr); + ok(current_domain == domain, "Unexpected domain %p, %p.\n", current_domain, domain); + IUnknown_Release(current_domain); + hr = IUnknown_QueryInterface(domain, &IID_IUnknown, (void **)&defaultdomain_unk); ok(SUCCEEDED(hr), "COM object doesn't support IUnknown?!\n"); @@ -584,6 +592,14 @@ static void test_createdomain(void) IUnknown_Release(domain); + hr = ICorRuntimeHost_GetDefaultDomain(runtimehost, &domain); + ok(SUCCEEDED(hr), "ICorRuntimeHost::GetDefaultDomain failed, hr=%#.8x\n", hr); + hr = ICorRuntimeHost_CurrentDomain(runtimehost, &current_domain); + ok(SUCCEEDED(hr), "Failed to get current domain, hr %#x.\n", hr); + ok(current_domain == domain, "Unexpected domain %p, %p.\n", current_domain, domain); + IUnknown_Release(current_domain); + IUnknown_Release(domain); + ok(defaultdomain_unk != newdomain_unk, "New and default domain objects are the same\n"); hr = ICorRuntimeHost_CreateDomainSetup(runtimehost, &domainsetup); -- 2.23.0.rc1

2 2

[PATCH 2/3] jscript: Replace '%pure-parser' with '%define api.pure'.
by Isira Seneviratne Aug. 21, 2019

Aug. 21, 2019

2 1

[PATCH 4/5] mshtml/tests: Add Object.defineProperties tests.
by Jacek Caban Aug. 21, 2019

Aug. 21, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/es5.js | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)

2 1

[PATCH 1/2] d3d9/tests: Test stencil reference truncation.
by Zhiyi Zhang Aug. 21, 2019

Aug. 21, 2019

This proves that stencil reference got truncated instead of ANDed with stencil mask. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f2c6ee42dc..c7de570b42 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11155,6 +11155,59 @@ static void stencil_cull_test(void) color = getPixelColor(device, 480, 60); ok(color == 0x00000080, "CW triangle, twoside TRUE, cull cw, culled, has color 0x%08x, expected 0x00000080\n", color); + /* Test for reference truncation */ + /* 1st pass: set stencil */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_STENCIL, 0x00ff0000, 0.0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFAIL, D3DSTENCILOP_KEEP); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILPASS, D3DSTENCILOP_REPLACE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0x1cc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_ALWAYS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, + 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* 2nd pass: draw image */ + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILPASS, D3DSTENCILOP_KEEP); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0xcc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0xff); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_EQUAL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, painter, sizeof(painter[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 280, 360); + todo_wine ok(color == 0x000000f0, "has color 0x%08x, expected 0x00000090\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -- 2.23.0.rc1

3 3