April 2018 - Wine-Devel - list.winehq.org

[PATCH] makefiles: Make it possible to only build the tests.
by Francois Gouget April 17, 2018

April 17, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This can be used by the TestBot to simplify how we build the Windows test executables while avoiding to build all the Windows dlls. Makefile.in | 3 ++- tools/makedep.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6b65fdfb8c0..07cbcd8e49d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,8 @@ # all (default): build wine # clean: remove all intermediate files # distclean: also remove all files created by configure -# test: run tests +# buildtests: build tests +# test: build and run tests # testclean: clean test results to force running all tests again # crosstest: build tests as native windows applications (requires MinGW) # install-lib: install libraries needed to run applications diff --git a/tools/makedep.c b/tools/makedep.c index c9ab24da790..eff039e8518 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3578,9 +3578,10 @@ static void output_subdirs( struct makefile *make ) } if (winetest_deps.count) { - output( "programs/winetest:" ); + output( "buildtests:" ); output_filenames( winetest_deps ); output( "\n" ); + output( "programs/winetest: buildtests\n" ); output( "check test:" ); for (i = 0; i < winetest_deps.count; i++) { -- 2.17.0

1 0

[v2 PATCH 2/2] advapi32/tests: Add basic tests for BuildSecurityDescriptor.
by Alistair Leslie-Hughes April 17, 2018

April 17, 2018

From: Sebastian Lackner <sebastian(a)fds-team.de> Removed an invalid test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/tests/security.c | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6ef6c41650..35fd032a84 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7316,6 +7316,42 @@ static void test_GetExplicitEntriesFromAclW(void) HeapFree(GetProcessHeap(), 0, old_acl); } +static void test_BuildSecurityDescriptorW(void) +{ + SECURITY_DESCRIPTOR old_sd, *new_sd, *rel_sd; + ULONG new_sd_size; + DWORD buf_size; + char buf[1024]; + BOOL success; + DWORD ret; + + InitializeSecurityDescriptor(&old_sd, SECURITY_DESCRIPTOR_REVISION); + + buf_size = sizeof(buf); + rel_sd = (SECURITY_DESCRIPTOR *)buf; + success = MakeSelfRelativeSD(&old_sd, rel_sd, &buf_size); + ok(success, "MakeSelfRelativeSD failed with %u\n", GetLastError()); + + new_sd = NULL; + new_sd_size = 0; + ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, NULL, &new_sd_size, (void **)&new_sd); + ok(ret == ERROR_SUCCESS, "BuildSecurityDescriptor failed with %u\n", ret); + ok(new_sd != NULL, "expected new_sd != NULL\n"); + LocalFree(new_sd); + + new_sd = (void *)0xdeadbeef; + ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, &old_sd, &new_sd_size, (void **)&new_sd); + ok(ret == ERROR_INVALID_SECURITY_DESCR, "expected ERROR_INVALID_SECURITY_DESCR, got %u\n", ret); + ok(new_sd == (void *)0xdeadbeef, "expected new_sd == 0xdeadbeef, got %p\n", new_sd); + + new_sd = NULL; + new_sd_size = 0; + ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, rel_sd, &new_sd_size, (void **)&new_sd); + ok(ret == ERROR_SUCCESS, "BuildSecurityDescriptor failed with %u\n", ret); + ok(new_sd != NULL, "expected new_sd != NULL\n"); + LocalFree(new_sd); +} + START_TEST(security) { init(); @@ -7370,6 +7406,7 @@ START_TEST(security) test_maximum_allowed(); test_token_label(); test_GetExplicitEntriesFromAclW(); + test_BuildSecurityDescriptorW(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.17.0

1 0

[v2 PATCH 1/2] advapi32: Implement BuildSecurityDescriptorW.
by Alistair Leslie-Hughes April 17, 2018

April 17, 2018

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/security.c | 218 +++++++++++++++++++++++++++++---------- 1 file changed, 164 insertions(+), 54 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f081b6b803..c03baa7b37 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -48,6 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); +static DWORD trustee_to_sid(DWORD nDestinationSidLength, PSID pDestinationSid, PTRUSTEEW pTrustee); typedef struct _ACEFLAG { @@ -1255,16 +1256,122 @@ DWORD WINAPI BuildSecurityDescriptorW( IN ULONG cCountOfAccessEntries, IN PEXPLICIT_ACCESSW pListOfAccessEntries, IN ULONG cCountOfAuditEntries, - IN PEXPLICIT_ACCESSW pListofAuditEntries, + IN PEXPLICIT_ACCESSW pListOfAuditEntries, IN PSECURITY_DESCRIPTOR pOldSD, IN OUT PULONG lpdwBufferLength, OUT PSECURITY_DESCRIPTOR* pNewSD) { - FIXME("(%p,%p,%d,%p,%d,%p,%p,%p,%p) stub!\n",pOwner,pGroup, - cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries, - pListofAuditEntries,pOldSD,lpdwBufferLength,pNewSD); + SECURITY_DESCRIPTOR desc; + NTSTATUS status; + DWORD ret = ERROR_SUCCESS; + + TRACE("(%p,%p,%d,%p,%d,%p,%p,%p,%p)\n", pOwner, pGroup, + cCountOfAccessEntries, pListOfAccessEntries, cCountOfAuditEntries, + pListOfAuditEntries, pOldSD, lpdwBufferLength, pNewSD); - return ERROR_CALL_NOT_IMPLEMENTED; + if (pOldSD) + { + SECURITY_DESCRIPTOR_CONTROL control; + DWORD desc_size, dacl_size = 0, sacl_size = 0, owner_size = 0, group_size = 0; + PACL dacl = NULL, sacl = NULL; + PSID owner = NULL, group = NULL; + DWORD revision; + + if ((status = RtlGetControlSecurityDescriptor( pOldSD, &control, &revision )) != STATUS_SUCCESS) + return RtlNtStatusToDosError( status ); + if (!(control & SE_SELF_RELATIVE)) + return ERROR_INVALID_SECURITY_DESCR; + + desc_size = sizeof(desc); + status = RtlSelfRelativeToAbsoluteSD( pOldSD, &desc, &desc_size, dacl, &dacl_size, sacl, &sacl_size, + owner, &owner_size, group, &group_size ); + if (status == STATUS_BUFFER_TOO_SMALL) + { + if (dacl_size) + dacl = LocalAlloc( LMEM_FIXED, dacl_size ); + if (sacl_size) + sacl = LocalAlloc( LMEM_FIXED, sacl_size ); + if (owner_size) + owner = LocalAlloc( LMEM_FIXED, owner_size ); + if (group_size) + group = LocalAlloc( LMEM_FIXED, group_size ); + + desc_size = sizeof(desc); + status = RtlSelfRelativeToAbsoluteSD( pOldSD, &desc, &desc_size, dacl, &dacl_size, sacl, &sacl_size, + owner, &owner_size, group, &group_size ); + } + if (status != STATUS_SUCCESS) + { + LocalFree( dacl ); + LocalFree( sacl ); + LocalFree( owner ); + LocalFree( group ); + return RtlNtStatusToDosError( status ); + } + } + else + { + if ((status = RtlCreateSecurityDescriptor( &desc, SECURITY_DESCRIPTOR_REVISION )) != STATUS_SUCCESS) + return RtlNtStatusToDosError( status ); + } + + if (pOwner) + { + LocalFree( desc.Owner ); + desc.Owner = LocalAlloc( LMEM_FIXED, sizeof(MAX_SID) ); + if ((ret = trustee_to_sid( sizeof(MAX_SID), desc.Owner, pOwner ))) + goto done; + } + + if (pGroup) + { + LocalFree( desc.Group ); + desc.Group = LocalAlloc( LMEM_FIXED, sizeof(MAX_SID) ); + if ((ret = trustee_to_sid( sizeof(MAX_SID), desc.Group, pGroup ))) + goto done; + } + + if (pListOfAccessEntries) + { + PACL new_dacl; + + if ((ret = SetEntriesInAclW( cCountOfAccessEntries, pListOfAccessEntries, desc.Dacl, &new_dacl ))) + goto done; + + LocalFree( desc.Dacl ); + desc.Dacl = new_dacl; + desc.Control |= SE_DACL_PRESENT; + } + + if (pListOfAuditEntries) + { + PACL new_sacl; + + if ((ret = SetEntriesInAclW( cCountOfAuditEntries, pListOfAuditEntries, desc.Sacl, &new_sacl ))) + goto done; + + LocalFree( desc.Sacl ); + desc.Sacl = new_sacl; + desc.Control |= SE_SACL_PRESENT; + } + + *lpdwBufferLength = RtlLengthSecurityDescriptor( &desc ); + *pNewSD = LocalAlloc( LMEM_FIXED, *lpdwBufferLength ); + + if ((status = RtlMakeSelfRelativeSD( &desc, *pNewSD, lpdwBufferLength )) != STATUS_SUCCESS) + { + ret = RtlNtStatusToDosError( status ); + LocalFree( *pNewSD ); + *pNewSD = NULL; + } + +done: + /* free absolute descriptor */ + LocalFree( desc.Owner ); + LocalFree( desc.Group ); + LocalFree( desc.Sacl ); + LocalFree( desc.Dacl ); + return ret; } /****************************************************************************** @@ -3754,6 +3861,56 @@ static void free_trustee_name(TRUSTEE_FORM form, WCHAR *trustee_nameW) } } +static DWORD trustee_to_sid( DWORD nDestinationSidLength, PSID pDestinationSid, PTRUSTEEW pTrustee ) +{ + if (pTrustee->MultipleTrusteeOperation == TRUSTEE_IS_IMPERSONATE) + { + WARN("bad multiple trustee operation %d\n", pTrustee->MultipleTrusteeOperation); + return ERROR_INVALID_PARAMETER; + } + + switch (pTrustee->TrusteeForm) + { + case TRUSTEE_IS_SID: + if (!CopySid(nDestinationSidLength, pDestinationSid, pTrustee->ptstrName)) + { + WARN("bad sid %p\n", pTrustee->ptstrName); + return ERROR_INVALID_PARAMETER; + } + break; + case TRUSTEE_IS_NAME: + { + DWORD sid_size = nDestinationSidLength; + DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1; + SID_NAME_USE use; + if (!strcmpW( pTrustee->ptstrName, CURRENT_USER )) + { + if (!lookup_user_account_name( pDestinationSid, &sid_size, NULL, &domain_size, &use )) + { + return GetLastError(); + } + } + else if (!LookupAccountNameW(NULL, pTrustee->ptstrName, pDestinationSid, &sid_size, NULL, &domain_size, &use)) + { + WARN("bad user name %s\n", debugstr_w(pTrustee->ptstrName)); + return ERROR_INVALID_PARAMETER; + } + break; + } + case TRUSTEE_IS_OBJECTS_AND_SID: + FIXME("TRUSTEE_IS_OBJECTS_AND_SID unimplemented\n"); + break; + case TRUSTEE_IS_OBJECTS_AND_NAME: + FIXME("TRUSTEE_IS_OBJECTS_AND_NAME unimplemented\n"); + break; + default: + WARN("bad trustee form %d\n", pTrustee->TrusteeForm); + return ERROR_INVALID_PARAMETER; + } + + return ERROR_SUCCESS; +} + /****************************************************************************** * SetEntriesInAclA [ADVAPI32.@] */ @@ -3849,56 +4006,9 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, pEntries[i].Trustee.TrusteeForm, pEntries[i].Trustee.TrusteeType, pEntries[i].Trustee.ptstrName); - if (pEntries[i].Trustee.MultipleTrusteeOperation == TRUSTEE_IS_IMPERSONATE) - { - WARN("bad multiple trustee operation %d for trustee %d\n", pEntries[i].Trustee.MultipleTrusteeOperation, i); - ret = ERROR_INVALID_PARAMETER; - goto exit; - } - - switch (pEntries[i].Trustee.TrusteeForm) - { - case TRUSTEE_IS_SID: - if (!CopySid(FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]), - ppsid[i], pEntries[i].Trustee.ptstrName)) - { - WARN("bad sid %p for trustee %d\n", pEntries[i].Trustee.ptstrName, i); - ret = ERROR_INVALID_PARAMETER; - goto exit; - } - break; - case TRUSTEE_IS_NAME: - { - DWORD sid_size = FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]); - DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1; - SID_NAME_USE use; - if (!strcmpW( pEntries[i].Trustee.ptstrName, CURRENT_USER )) - { - if (!lookup_user_account_name( ppsid[i], &sid_size, NULL, &domain_size, &use )) - { - ret = GetLastError(); - goto exit; - } - } - else if (!LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) - { - WARN("bad user name %s for trustee %d\n", debugstr_w(pEntries[i].Trustee.ptstrName), i); - ret = ERROR_INVALID_PARAMETER; - goto exit; - } - break; - } - case TRUSTEE_IS_OBJECTS_AND_SID: - FIXME("TRUSTEE_IS_OBJECTS_AND_SID unimplemented\n"); - break; - case TRUSTEE_IS_OBJECTS_AND_NAME: - FIXME("TRUSTEE_IS_OBJECTS_AND_NAME unimplemented\n"); - break; - default: - WARN("bad trustee form %d for trustee %d\n", pEntries[i].Trustee.TrusteeForm, i); - ret = ERROR_INVALID_PARAMETER; + ret = trustee_to_sid( FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]), ppsid[i], &pEntries[i].Trustee); + if (ret) goto exit; - } /* Note: we overestimate the ACL size here as a tradeoff between * instructions (simplicity) and memory */ -- 2.17.0

1 0

[PATCH] d3dx9_36: implement (?) loading user data in D3DXLoadMeshHierarchyFromXInMemory
by Rafał Mużyło April 17, 2018

April 17, 2018

Question mark, cause it's likely broken is some way. Yet, things still work at least as good as before and going by the description of how things are supposed to work, this should be close to that. Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl>

2 1

[PATCH 1/4] d3d10core/tests: Add additional tests for shader input/output matching.
by Józef Kucia April 17, 2018

April 17, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 80 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 73 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6982a4ed14b0..421512f40cc9 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -10583,6 +10583,7 @@ static void test_shader_interstage_interface(void) ID3D10Device *device; UINT stride, offset; ID3D10Buffer *vb; + unsigned int i; HRESULT hr; static const DWORD vs_code[] = @@ -10655,6 +10656,56 @@ static void test_shader_interstage_interface(void) 0x0010000a, 0x00000000, 0x07000000, 0x00102012, 0x00000000, 0x0010101a, 0x00000001, 0x0010100a, 0x00000002, 0x05000036, 0x001020c2, 0x00000000, 0x001012a6, 0x00000001, 0x0100003e, }; + static const DWORD ps_partial_input_code[] = + { +#if 0 + void main(float4 position : SV_Position, float2 t0 : TEXCOORD0, + nointerpolation float t1 : TEXCOORD1, uint t2 : TEXCOORD2, + uint t3 : TEXCOORD3, out float4 o : SV_Target) + { + o.x = t0.y + t1; + o.y = t2 + t3; + o.z = 0.0f; + o.w = t0.x; + } +#endif + 0x43425844, 0x5b1db356, 0xaa5a5e9d, 0xb916a081, 0x61e6dcb1, 0x00000001, 0x000001cc, 0x00000003, + 0x0000002c, 0x000000cc, 0x00000100, 0x4e475349, 0x00000098, 0x00000005, 0x00000008, 0x00000080, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000008c, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x0000008c, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x0000008c, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000202, 0x0000008c, + 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000404, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x43584554, 0x44524f4f, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, + 0x52444853, 0x000000c4, 0x00000040, 0x00000031, 0x03001062, 0x00101032, 0x00000001, 0x03000862, + 0x00101012, 0x00000002, 0x03000862, 0x00101022, 0x00000002, 0x03000862, 0x00101042, 0x00000002, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0700001e, 0x00100012, 0x00000000, + 0x0010102a, 0x00000002, 0x0010101a, 0x00000002, 0x05000056, 0x00102022, 0x00000000, 0x0010000a, + 0x00000000, 0x07000000, 0x00102012, 0x00000000, 0x0010101a, 0x00000001, 0x0010100a, 0x00000002, + 0x05000036, 0x00102042, 0x00000000, 0x00004001, 0x00000000, 0x05000036, 0x00102082, 0x00000000, + 0x0010100a, 0x00000001, 0x0100003e, + }; + static const DWORD ps_single_input_code[] = + { +#if 0 + void main(float4 position : SV_Position, float2 t0 : TEXCOORD0, out float4 o : SV_Target) + { + o.x = t0.x; + o.y = t0.y; + o.z = 1.0f; + o.w = 2.0f; + } +#endif + 0x43425844, 0x7cc601b6, 0xc65b8bdb, 0x54d0f606, 0x9cc74d3d, 0x00000001, 0x00000118, 0x00000003, + 0x0000002c, 0x00000084, 0x000000b8, 0x4e475349, 0x00000050, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, + 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, + 0x00000040, 0x00000016, 0x03001062, 0x00101032, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x00102032, 0x00000000, 0x00101046, 0x00000001, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x3f800000, 0x40000000, 0x0100003e, + }; static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = { {"SV_POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, @@ -10681,7 +10732,18 @@ static void test_shader_interstage_interface(void) {{ 1.0f, 1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, }; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - static const struct vec4 expected_result = {10.0f, 8.0f, 7.0f, 3.0f}; + static const struct + { + const DWORD *ps_code; + size_t ps_size; + struct vec4 expected_result; + } + tests[] = + { + {ps_code, sizeof(ps_code), {10.0f, 8.0f, 7.0f, 3.0f}}, + {ps_partial_input_code, sizeof(ps_partial_input_code), {10.0f, 8.0f, 0.0f, 3.0f}}, + {ps_single_input_code, sizeof(ps_single_input_code), {3.0f, 5.0f, 1.0f, 2.0f}}, + }; if (!init_test_context(&test_context)) return; @@ -10690,8 +10752,6 @@ static void test_shader_interstage_interface(void) hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); - hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); - ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; @@ -10711,20 +10771,26 @@ static void test_shader_interstage_interface(void) ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); - ID3D10Device_PSSetShader(device, ps); ID3D10Device_VSSetShader(device, vs); ID3D10Device_IASetInputLayout(device, input_layout); ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); offset = 0; stride = sizeof(*quad); ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); - ID3D10Device_Draw(device, 4, 0); - check_texture_vec4(render_target, &expected_result, 0); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = ID3D10Device_CreatePixelShader(device, tests[i].ps_code, tests[i].ps_size, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + ID3D10Device_Draw(device, 4, 0); + check_texture_vec4(render_target, &tests[i].expected_result, 0); + ID3D10PixelShader_Release(ps); + } ID3D10InputLayout_Release(input_layout); ID3D10RenderTargetView_Release(rtv); ID3D10Texture2D_Release(render_target); - ID3D10PixelShader_Release(ps); ID3D10VertexShader_Release(vs); ID3D10Buffer_Release(vb); release_test_context(&test_context); -- 2.16.1

2 7

[PATCH 1/2] d3d11: Allow setting multiple viewports
by Nikolay Sivov April 17, 2018

April 17, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 25 +++++++++++++------------ dlls/d3d11/tests/d3d11.c | 28 ++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 659b33c101..9f1533b8df 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -961,25 +961,26 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic UINT viewport_count, const D3D11_VIEWPORT *viewports) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); - struct wined3d_viewport wined3d_vp; + struct wined3d_viewport wined3d_vp[WINED3D_MAX_VIEWPORTS]; + unsigned int i; TRACE("iface %p, viewport_count %u, viewports %p.\n", iface, viewport_count, viewports); - if (viewport_count > 1) - FIXME("Multiple viewports not implemented.\n"); - - if (!viewport_count) + if (viewport_count > ARRAY_SIZE(wined3d_vp)) return; - wined3d_vp.x = viewports[0].TopLeftX; - wined3d_vp.y = viewports[0].TopLeftY; - wined3d_vp.width = viewports[0].Width; - wined3d_vp.height = viewports[0].Height; - wined3d_vp.min_z = viewports[0].MinDepth; - wined3d_vp.max_z = viewports[0].MaxDepth; + for (i = 0; i < viewport_count; ++i) + { + wined3d_vp[i].x = viewports[i].TopLeftX; + wined3d_vp[i].y = viewports[i].TopLeftY; + wined3d_vp[i].width = viewports[i].Width; + wined3d_vp[i].height = viewports[i].Height; + wined3d_vp[i].min_z = viewports[i].MinDepth; + wined3d_vp[i].max_z = viewports[i].MaxDepth; + } wined3d_mutex_lock(); - wined3d_device_set_viewports(device->wined3d_device, 1, &wined3d_vp); + wined3d_device_set_viewports(device->wined3d_device, viewport_count, wined3d_vp); wined3d_mutex_unlock(); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b3597ad1b3..770ab0af34 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10578,7 +10578,6 @@ static void test_clear_state(void) ID3D11DeviceContext_RSGetViewports(context, &count, tmp_viewport); for (i = 0; i < D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - todo_wine_if(!i) ok(!tmp_viewport[i].TopLeftX && !tmp_viewport[i].TopLeftY && !tmp_viewport[i].Width && !tmp_viewport[i].Height && !tmp_viewport[i].MinDepth && !tmp_viewport[i].MaxDepth, "Got unexpected viewport {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e} in slot %u.\n", @@ -25927,6 +25926,7 @@ static void test_multiple_viewports(void) unsigned int draw_id; unsigned int padding[3]; } constant; + D3D11_VIEWPORT vp[D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE + 1]; struct d3d11_test_context test_context; D3D11_TEXTURE2D_DESC texture_desc; ID3D11DeviceContext *context; @@ -26014,7 +26014,7 @@ static void test_multiple_viewports(void) {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, }; static const float clear_color[] = {0.5f, 0.5f, 0.0f, 0.0f}; - D3D11_VIEWPORT vp[2]; + unsigned int count, i; RECT rect; int width; @@ -26078,7 +26078,6 @@ static void test_multiple_viewports(void) SetRect(&rect, 0, 0, width - 1, texture_desc.Height - 1); check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[0], 1); SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); -todo_wine check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[1], 1); /* One viewport. */ @@ -26098,9 +26097,30 @@ todo_wine constant.draw_id = 3; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); draw_quad(&test_context); -todo_wine check_texture_sub_resource_vec4(texture, 0, NULL, &expected_values[4], 1); + /* Viewport count exceeding maximum value. */ + ID3D11DeviceContext_RSSetViewports(context, 1, vp); + + vp[0].TopLeftX = 1.0f; + vp[0].TopLeftY = 0.0f; + vp[0].Width = width; + vp[0].Height = texture_desc.Height; + vp[0].MinDepth = 0.0f; + vp[0].MaxDepth = 1.0f; + for (i = 1; i < ARRAY_SIZE(vp); ++i) + { + vp[i] = vp[0]; + } + ID3D11DeviceContext_RSSetViewports(context, ARRAY_SIZE(vp), vp); + + count = ARRAY_SIZE(vp); + memset(vp, 0, sizeof(vp)); + ID3D11DeviceContext_RSGetViewports(context, &count, vp); +todo_wine + ok(count == 1, "Unexpected viewport count %d.\n", count); + ok(vp[0].TopLeftX == 0.0f && vp[0].Width == width, "Unexpected viewport.\n"); + ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture); -- 2.17.0

2 3

Add support to nexttoward{,f,l}
by Johan Oudinet April 17, 2018

April 17, 2018

Hi, I've encountered a wine error when running an application, saying that a function is not implemented: wine: Call from 0x7b43ce3c to unimplemented function api-ms-win-crt-math-l1-1-0.dll.nexttowardf, aborting I've looked into the wine's git repository and found that this function is declared as a stub, while the equivalent nextafter variants have been defined since 072f34be730761faa2fabefa8e4a3306d19c4a63 I'm new to wine development and know nothing about windows but I think I should be able to enable nexttoward, nexttowardf, and nexttowardl functions, just by following the modifications in the commit above. According to cppreference, such functions have been added at the same time: http://en.cppreference.com/w/cpp/numeric/math/nextafter I'd like your opinion before I submit a patch here. Best, -- Johan

2 2

[PATCH v2 1/5] msi: Make MsiGetProperty() RPC-compatible.
by Zebediah Figura April 17, 2018

April 17, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix embedded nulls dlls/msi/custom.c | 11 ++++++++ dlls/msi/package.c | 73 ++++++++++++++++++++++++---------------------------- dlls/msi/winemsi.idl | 2 +- 3 files changed, 46 insertions(+), 40 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index e2ed5a4..83b1687 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -34,6 +34,7 @@ #include "msipriv.h" #include "winemsi.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wine/exception.h" @@ -64,6 +65,16 @@ static CRITICAL_SECTION msi_custom_action_cs = { &msi_custom_action_cs_debug, -1 static struct list msi_pending_custom_actions = LIST_INIT( msi_pending_custom_actions ); +void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) +{ + return heap_alloc(len); +} + +void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) +{ + heap_free(ptr); +} + UINT msi_schedule_action( MSIPACKAGE *package, UINT script, const WCHAR *action ) { UINT count; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4e1ac2f..4986ec1 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -29,7 +29,6 @@ #include "winnls.h" #include "shlwapi.h" #include "wingdi.h" -#include "wine/debug.h" #include "msi.h" #include "msiquery.h" #include "objidl.h" @@ -39,11 +38,14 @@ #include "winver.h" #include "urlmon.h" #include "shlobj.h" -#include "wine/unicode.h" #include "objbase.h" #include "msidefs.h" #include "sddl.h" +#include "wine/heap.h" +#include "wine/debug.h" +#include "wine/unicode.h" + #include "msipriv.h" #include "winemsi.h" #include "resource.h" @@ -2396,52 +2398,34 @@ static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ); if (!package) { - HRESULT hr; - LPWSTR value = NULL; + LPWSTR value = NULL, buffer; MSIHANDLE remote; - BSTR bname; if (!(remote = msi_get_remote(handle))) return ERROR_INVALID_HANDLE; - bname = SysAllocString( name ); - if (!bname) - return ERROR_OUTOFMEMORY; + r = remote_GetProperty(remote, name, &value, &len); + if (r != ERROR_SUCCESS) + return r; - hr = remote_GetProperty(remote, bname, NULL, &len); - if (FAILED(hr)) - goto done; - - len++; - value = msi_alloc(len * sizeof(WCHAR)); - if (!value) + /* String might contain embedded nulls. + * Native returns the correct size but truncates the string. */ + buffer = heap_alloc_zero((len + 1) * sizeof(WCHAR)); + if (!buffer) { - r = ERROR_OUTOFMEMORY; - goto done; + midl_user_free(value); + return ERROR_OUTOFMEMORY; } + strcpyW(buffer, value); - hr = remote_GetProperty(remote, bname, value, &len); - if (FAILED(hr)) - goto done; - - r = msi_strcpy_to_awstring( value, len, szValueBuf, pchValueBuf ); + r = msi_strcpy_to_awstring(buffer, len, szValueBuf, pchValueBuf); /* Bug required by Adobe installers */ - if (!szValueBuf->unicode && !szValueBuf->str.a) + if (pchValueBuf && !szValueBuf->unicode && !szValueBuf->str.a) *pchValueBuf *= sizeof(WCHAR); -done: - SysFreeString(bname); - msi_free(value); - - if (FAILED(hr)) - { - if (HRESULT_FACILITY(hr) == FACILITY_WIN32) - return HRESULT_CODE(hr); - - return ERROR_FUNCTION_FAILED; - } - + heap_free(buffer); + midl_user_free(value); return r; } @@ -2498,11 +2482,22 @@ HRESULT __cdecl remote_GetActiveDatabase(MSIHANDLE hinst, MSIHANDLE *handle) return S_OK; } -HRESULT __cdecl remote_GetProperty(MSIHANDLE hinst, BSTR property, BSTR value, DWORD *size) +UINT __cdecl remote_GetProperty(MSIHANDLE hinst, LPCWSTR property, LPWSTR *value, DWORD *size) { - UINT r = MsiGetPropertyW(hinst, property, value, size); - if (r != ERROR_SUCCESS) return HRESULT_FROM_WIN32(r); - return S_OK; + WCHAR empty[1]; + UINT r; + + *size = 0; + r = MsiGetPropertyW(hinst, property, empty, size); + if (r == ERROR_MORE_DATA) + { + ++*size; + *value = midl_user_allocate(*size * sizeof(WCHAR)); + if (!*value) + return ERROR_OUTOFMEMORY; + r = MsiGetPropertyW(hinst, property, *value, size); + } + return r; } HRESULT __cdecl remote_SetProperty(MSIHANDLE hinst, BSTR property, BSTR value) diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 706eb99..d9695e6 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -40,7 +40,7 @@ interface IWineMsiRemote HRESULT remote_DatabaseOpenView( [in] MSIHANDLE db, [in] LPCWSTR query, [out] MSIHANDLE *view ); HRESULT remote_GetActiveDatabase( [in] MSIHANDLE hinst, [out] MSIHANDLE *handle ); - HRESULT remote_GetProperty( [in] MSIHANDLE hinst, [in] BSTR property, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); + UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); HRESULT remote_SetProperty( [in] MSIHANDLE hinst, [in] BSTR property, [in] BSTR value ); HRESULT remote_ProcessMessage( [in] MSIHANDLE hinst, [in] INSTALLMESSAGE message, [in] MSIHANDLE record ); HRESULT remote_DoAction( [in] MSIHANDLE hinst, [in] BSTR action ); -- 2.7.4

3 10

[PATCH 1/6] msi: Make MsiGetProperty() RPC-compatible.
by Zebediah Figura April 17, 2018

April 17, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/custom.c | 11 ++++++++++ dlls/msi/package.c | 59 ++++++++++++++++++---------------------------------- dlls/msi/winemsi.idl | 2 +- 3 files changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index e2ed5a4..83b1687 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -34,6 +34,7 @@ #include "msipriv.h" #include "winemsi.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wine/exception.h" @@ -64,6 +65,16 @@ static CRITICAL_SECTION msi_custom_action_cs = { &msi_custom_action_cs_debug, -1 static struct list msi_pending_custom_actions = LIST_INIT( msi_pending_custom_actions ); +void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) +{ + return heap_alloc(len); +} + +void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) +{ + heap_free(ptr); +} + UINT msi_schedule_action( MSIPACKAGE *package, UINT script, const WCHAR *action ) { UINT count; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4e1ac2f..86975e0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2396,52 +2396,23 @@ static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ); if (!package) { - HRESULT hr; LPWSTR value = NULL; MSIHANDLE remote; - BSTR bname; if (!(remote = msi_get_remote(handle))) return ERROR_INVALID_HANDLE; - bname = SysAllocString( name ); - if (!bname) - return ERROR_OUTOFMEMORY; + r = remote_GetProperty(remote, name, &value); + if (r != ERROR_SUCCESS) + return r; - hr = remote_GetProperty(remote, bname, NULL, &len); - if (FAILED(hr)) - goto done; - - len++; - value = msi_alloc(len * sizeof(WCHAR)); - if (!value) - { - r = ERROR_OUTOFMEMORY; - goto done; - } - - hr = remote_GetProperty(remote, bname, value, &len); - if (FAILED(hr)) - goto done; - - r = msi_strcpy_to_awstring( value, len, szValueBuf, pchValueBuf ); + r = msi_strcpy_to_awstring(value, -1, szValueBuf, pchValueBuf); /* Bug required by Adobe installers */ - if (!szValueBuf->unicode && !szValueBuf->str.a) + if (pchValueBuf && !szValueBuf->unicode && !szValueBuf->str.a) *pchValueBuf *= sizeof(WCHAR); -done: - SysFreeString(bname); - msi_free(value); - - if (FAILED(hr)) - { - if (HRESULT_FACILITY(hr) == FACILITY_WIN32) - return HRESULT_CODE(hr); - - return ERROR_FUNCTION_FAILED; - } - + midl_user_free(value); return r; } @@ -2498,11 +2469,21 @@ HRESULT __cdecl remote_GetActiveDatabase(MSIHANDLE hinst, MSIHANDLE *handle) return S_OK; } -HRESULT __cdecl remote_GetProperty(MSIHANDLE hinst, BSTR property, BSTR value, DWORD *size) +UINT __cdecl remote_GetProperty(MSIHANDLE hinst, LPCWSTR property, LPWSTR *value) { - UINT r = MsiGetPropertyW(hinst, property, value, size); - if (r != ERROR_SUCCESS) return HRESULT_FROM_WIN32(r); - return S_OK; + WCHAR empty[1]; + DWORD size = 0; + UINT r; + + r = MsiGetPropertyW(hinst, property, empty, &size); + if (r == ERROR_MORE_DATA) + { + *value = midl_user_allocate(++size * sizeof(WCHAR)); + if (!*value) + return ERROR_OUTOFMEMORY; + r = MsiGetPropertyW(hinst, property, *value, &size); + } + return r; } HRESULT __cdecl remote_SetProperty(MSIHANDLE hinst, BSTR property, BSTR value) diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 706eb99..5e84ea8 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -40,7 +40,7 @@ interface IWineMsiRemote HRESULT remote_DatabaseOpenView( [in] MSIHANDLE db, [in] LPCWSTR query, [out] MSIHANDLE *view ); HRESULT remote_GetActiveDatabase( [in] MSIHANDLE hinst, [out] MSIHANDLE *handle ); - HRESULT remote_GetProperty( [in] MSIHANDLE hinst, [in] BSTR property, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); + UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value ); HRESULT remote_SetProperty( [in] MSIHANDLE hinst, [in] BSTR property, [in] BSTR value ); HRESULT remote_ProcessMessage( [in] MSIHANDLE hinst, [in] INSTALLMESSAGE message, [in] MSIHANDLE record ); HRESULT remote_DoAction( [in] MSIHANDLE hinst, [in] BSTR action ); -- 2.7.4

4 20

[PATCH v2] user32: Fix using DrawTextEx() to calculate rect with flag DT_BOTTOM.
by Zhiyi Zhang April 17, 2018

April 17, 2018

Supersede 144845. Last was incorrectly wrapped by the mail client. Fix using DrawTextEx to calculate text rect with DT_BOTTOM flag set returns zero for text height. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/text.c | 12 ++++++++++++ dlls/user32/text.c | 46 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 3cc9571521..e07bb2f168 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -28,6 +28,8 @@ #include "winerror.h" #include "winnls.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + #define MODIFIED(rect) (rect.left == 10 && rect.right != 100 && rect.top == 10 && rect.bottom != 100) #define EMPTY(rect) (rect.left == rect.right && rect.bottom == rect.top) @@ -46,11 +48,13 @@ static void test_DrawTextCalcRect(void) static CHAR wordbreak_text[] = "line1 line2"; static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; static char tabstring[] = "one\ttwo"; + static DWORD alignments[] = {DT_TOP, DT_LEFT, DT_CENTER, DT_RIGHT, DT_VCENTER, DT_BOTTOM}; INT textlen, textheight, heightcheck; RECT rect = { 0, 0, 100, 0 }, rect2; BOOL ret; DRAWTEXTPARAMS dtp; BOOL conform_xp = TRUE; + INT i; /* Initialization */ hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, @@ -586,6 +590,14 @@ static void test_DrawTextCalcRect(void) ok(rect.top == rect2.top, "unexpected value %d, got %d\n", rect.top, rect2.top); ok(rect.bottom == rect2.bottom , "unexpected value %d, got %d\n", rect.bottom, rect2.bottom); + for (i = 0; i < ARRAY_SIZE(alignments); i++) + { + SetRectEmpty(&rect); + textheight = DrawTextA(hdc, tabstring, -1, &rect, DT_NOCLIP | DT_CALCRECT | DT_SINGLELINE | alignments[i]); + ok(textheight > 0, "Alignment 0x%08x got unexpected textheight %d\n", alignments[i], textheight); + ok(rect.right - rect.left > 0, "Alignment 0x%08x got unexpected rect width %d\n", alignments[i], + rect.right - rect.left); + } SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 0b5bd47461..f0a882c343 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -808,7 +808,6 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, return NULL; } - /*********************************************************************** * TEXT_DrawUnderscore * @@ -874,17 +873,17 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, WCHAR *retstr, *p_retstr; size_t size_retstr; WCHAR line[MAX_BUFFER]; - int len, lh, count=i_count; + int len, lh, count = i_count, old_count, line_count = 0; TEXTMETRICW tm; int lmargin = 0, rmargin = 0; int x = rect->left, y = rect->top; int width = rect->right - rect->left; - int max_width = 0; + int max_width = 0, max_height = 0; int last_line; int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; - BOOL invert_y=FALSE; + BOOL invert_y = FALSE, is_fist_line = TRUE; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -968,6 +967,29 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, } p_retstr = retstr; + old_count = count; + do + { + len = ARRAY_SIZE(line); + if (invert_y) + last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2 * lh - 1 : lh) < rect->bottom; + else + last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2 * lh - 1 : lh) > rect->bottom; + strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, + &prefix_offset, &ellip); + + if (invert_y) + y -= lh; + else + y += lh; + + line_count++; + } while (strPtr && !last_line); + max_height = line_count * lh; + + strPtr = str; + count = old_count; + y = rect->top; do { len = ARRAY_SIZE(line); @@ -981,11 +1003,15 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, size.cx) / 2; else if (flags & DT_RIGHT) x = rect->right - size.cx; - if (flags & DT_SINGLELINE) - { - if (flags & DT_VCENTER) y = rect->top + - (rect->bottom - rect->top) / 2 - size.cy / 2; - else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; + if (is_fist_line) + { + if (flags & DT_VCENTER) + y = invert_y ? rect->top - (rect->bottom - rect->top) / 2 + max_height / 2 + : rect->top + (rect->bottom - rect->top) / 2 - max_height / 2; + else if (flags & DT_BOTTOM) + y = invert_y ? rect->bottom + max_height : rect->bottom - max_height; + + is_fist_line = FALSE; } if (!(flags & DT_CALCRECT)) @@ -1071,7 +1097,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, memcpy (str, retstr, size_retstr); HeapFree (GetProcessHeap(), 0, retstr); } - return y - rect->top; + return invert_y ? -max_height : max_height; } /*********************************************************************** -- 2.16.3

2 1