November 2015 - Wine-Devel - list.winehq.org

Re: [resend 3/5] ddraw7/tests: test SetColorKey on cubemap surfaces
by Stefan Dösinger Nov. 5, 2015

Nov. 5, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-11-04 um 19:51 schrieb Riccardo Bortolato: > + hr = IDirectDrawSurface7_GetColorKey(mipmap, DDCKEY_SRCBLT, > &color_key); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr > %#x.\n", hr); + color_key.dwColorSpaceLowValue = 0x0000ff00; + > color_key.dwColorSpaceHighValue = 0x0000ff00; + hr = > IDirectDrawSurface7_SetColorKey(mipmap, DDCKEY_SRCBLT, > &color_key); + ok(SUCCEEDED(hr), "Failed to set color key, hr > %#x.\n", hr); One more thing that's interesting to test here: Set a different color key, and after the successful SetColorKey test which one you get back. You might even get DDERR_NOCOLORKEY back after the successful Set. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWO0wKAAoJEN0/YqbEcdMwsn4P/A9Mgwuq+4H0/2atLKdVlX7u RBAx/ZrhNEXT5W0Kzo1eZCUD5RjKf4mnuUi6x6LwX7JczJ9Dxxcz2Xx4gfeb3Wmy d6F2ttzejkKwG+tPkWfzc9AG0oZ0uFxvMuyBEdMqNxRAQXec7sxse9ELlsA7A1Wk snwvheVQ7o6XP6qya9mJBgiyWRH/86VzhW4/P6EluINmcXCVL/UaZKnj7BgYL7Yy pFvFN9r7N92bAspIsIl0MxnmxZ6qbK13qbqr4JJPvjSX8TfKQfoXsHj5BW0ZoZaR uWBvKtTmF0mhcY3rVOr/tQcBtp7xBYB0QiqBwMx0lBS1gZyaoeasEEFcP8s4HROs YHV3WKxG/esYAsqNfVRH+5wWUthTT0bthOv7mUuBwMC53kQOw5eqw9v5WOwW1Omu HRZ6ssDfvMx9YWhw06DIPnaCfyEL2KfxksRHA6TMHWbY8lHNL5nP0cc+tQhKXymc c2QS0awqTX95kjf+K0giBGRhnI/BXJa3jH2Bs9/8YXtyWq8k5UvKOZbjk6IUeeod KVgARsBCQ+3idRRU9nGA4P0OkjRymQFS7U+2DLYofIjv71p/TldvkOPUKKG3y8N4 rMhpCgsyGxEuHKnz4eLTirrjGEp+NPNIy6R7aSqd/j5XjSaHujtZjv84UBuyF60Y Z/UQmUCIFyr8IiIQSFZv =Ktln -----END PGP SIGNATURE-----

2 2

Re: ws2_32/tests: Add WSAPoll() tests
by Marvin Nov. 5, 2015

Nov. 5, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17995 Your paranoid android. === build (build) === Make failed

1 0

Re: [6/6] oleaut32/tests: Add a bunch of new tests for typelib generation.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > --- > dlls/oleaut32/tests/test_tlb.idl | 59 +++++++++ > dlls/oleaut32/tests/typelib.c | 259 ++++++++++++++++++++++++++++++++++++--- > 2 files changed, 298 insertions(+), 20 deletions(-) This is causing build warnings. I understand it may be deliberate in order to test that path, but a standard build should be warning-free so this needs to be done differently. ../../../tools/widl/widl -o test_tlb.tlb -m32 -I. -I../../../include -D__WINESRC__ test_tlb.idl warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a753903} warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a753906} warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a75396b} warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a75396d} warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a753970} warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a753972} -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [v6 05/13] ddraw7/tests: Test SetColorKey() on cubemap surfaces.
by Marvin Nov. 5, 2015

Nov. 5, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17994 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2243: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw7.c:3084: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3086: Test failed: Got unexpected screen width 1024. ddraw7.c:3088: Test failed: Got unexpected screen height 768. ddraw7.c:3101: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3103: Test failed: Got unexpected screen width 1024. ddraw7.c:3105: Test failed: Got unexpected screen height 768. ddraw7.c:3109: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3111: Test failed: Got unexpected screen width 1024. ddraw7.c:3113: Test failed: Got unexpected screen height 768. ddraw7.c:3132: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3134: Test failed: Got unexpected screen width 1024. ddraw7.c:3136: Test failed: Got unexpected screen height 768. ddraw7.c:3140: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3142: Test failed: Got unexpected screen width 1024. ddraw7.c:3144: Test failed: Got unexpected screen height 768. ddraw7.c:3164: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3166: Test failed: Got unexpected screen width 1024. ddraw7.c:3168: Test failed: Got unexpected screen height 768. ddraw7.c:3173: Test failed: Got unexpected screen width 1024. ddraw7.c:3175: Test failed: Got unexpected screen height 768. ddraw7.c:3188: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3190: Test failed: Got unexpected screen width 1024. ddraw7.c:3192: Test failed: Got unexpected screen height 768. ddraw7.c:3196: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3198: Test failed: Got unexpected screen width 1024. ddraw7.c:3200: Test failed: Got unexpected screen height 768. ddraw7.c:3208: Test failed: Got unexpected screen width 1024. ddraw7.c:3210: Test failed: Got unexpected screen height 768. ddraw7.c:3222: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3224: Test failed: Got unexpected screen width 1024. ddraw7.c:3226: Test failed: Got unexpected screen height 768. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4081: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4094: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4110: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4129: Test failed: Display mode restored after ddraw1-ddraw7 SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:5937: Test failed: Failed to set display mode, hr 0x80004001. === w864 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000 === w1064 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000

1 0

Re: [1/5] gdi32: Fix the advance width in synthetic bold glyphs when using scaling factors.
by Huw Davies Nov. 5, 2015

Nov. 5, 2015

On Tue, Nov 03, 2015 at 03:06:24PM +0900, Akihiro Sagawa wrote: > @@ -6297,6 +6299,14 @@ static inline BOOL is_identity_MAT2(const MAT2 *matrix) > return !memcmp(matrix, &identity, sizeof(MAT2)); > } > > +static inline void calc_unit_vector(FT_Vector *vec) > +{ > + FT_Fixed len; > + len = pFT_Vector_Length(vec); > + vec->x = (vec->x << 6) / len; > + vec->y = (vec->y << 6) / len; > +} You need to check for division by zero. Huw.

2 1

Re: [1/5] gdi32: Fix the advance width in synthetic bold glyphs when using scaling factors.
by Henri Verbeet Nov. 5, 2015

Nov. 5, 2015

> +static inline void calc_unit_vector(FT_Vector *vec) > +{ > + FT_Fixed len; > + len = pFT_Vector_Length(vec); > + vec->x = (vec->x << 6) / len; > + vec->y = (vec->y << 6) / len; > +} For what it's worth, that's usually called normalisation. Given how this is used, there's probably something to be said for not modifying the input vector and just having an output variable instead.

2 1

Re: [resend 3/5] ddraw7/tests: test SetColorKey on cubemap surfaces
by Marvin Nov. 5, 2015

Nov. 5, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17975 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2243: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw7.c:3084: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3086: Test failed: Got unexpected screen width 1024. ddraw7.c:3088: Test failed: Got unexpected screen height 768. ddraw7.c:3101: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3103: Test failed: Got unexpected screen width 1024. ddraw7.c:3105: Test failed: Got unexpected screen height 768. ddraw7.c:3109: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3111: Test failed: Got unexpected screen width 1024. ddraw7.c:3113: Test failed: Got unexpected screen height 768. ddraw7.c:3132: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3134: Test failed: Got unexpected screen width 1024. ddraw7.c:3136: Test failed: Got unexpected screen height 768. ddraw7.c:3140: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3142: Test failed: Got unexpected screen width 1024. ddraw7.c:3144: Test failed: Got unexpected screen height 768. ddraw7.c:3164: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3166: Test failed: Got unexpected screen width 1024. ddraw7.c:3168: Test failed: Got unexpected screen height 768. ddraw7.c:3173: Test failed: Got unexpected screen width 1024. ddraw7.c:3175: Test failed: Got unexpected screen height 768. ddraw7.c:3188: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3190: Test failed: Got unexpected screen width 1024. ddraw7.c:3192: Test failed: Got unexpected screen height 768. ddraw7.c:3196: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3198: Test failed: Got unexpected screen width 1024. ddraw7.c:3200: Test failed: Got unexpected screen height 768. ddraw7.c:3208: Test failed: Got unexpected screen width 1024. ddraw7.c:3210: Test failed: Got unexpected screen height 768. ddraw7.c:3222: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3224: Test failed: Got unexpected screen width 1024. ddraw7.c:3226: Test failed: Got unexpected screen height 768. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4081: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4094: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4110: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4129: Test failed: Display mode restored after ddraw1-ddraw7 SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:5937: Test failed: Failed to set display mode, hr 0x80004001. === w864 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000 === w1064 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000

3 3

Re: [resend 5/5] wined3d: remove wined3d_surface_{inc,dec}ref
by Henri Verbeet Nov. 5, 2015

Nov. 5, 2015

For what it's worth, this patch seems fine. You should probably move it to the start of the series. It would be nice if you could split it per function that you modify (and used capitalization and punctuation in the subject line), but it's not strictly required.

2 1

Re: [resend 1/5] ddraw: check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority
by Stefan Dösinger Nov. 5, 2015

Nov. 5, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-11-04 um 19:51 schrieb Riccardo Bortolato: > - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) > + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)) > { > WARN("Called on non-managed texture or mipmap sublevel, returning DDERR_INVALIDPARAMS.\n"); > hr = DDERR_INVALIDPARAMS; This will cause a crash if called on a top level cube map that's not the positive X face because the follow-up code assumes that surface->wined3d_texture is there. This could use a test as well, similarly to SetColorKey. It's possible that crashing is the right thing to do. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWO0z2AAoJEN0/YqbEcdMwrhgP/03F5zCAxKbJ738MrKYu2iUk 0azMw0sVdO2trn9KzuAbGKr74HBJCmhnGCBwWvTnn767UmUU73kbuY/VHQ6ZsiMt 9qNwDYQew/VIzXeDPPDOgtwkj+tpFrYeBGZVpPAPqcY2QoCGvS1VXTfUnKHQWnYF BxI1Qwh0xOi30saYG2UVzCI2G1DWH8/FVB4K9k/4FXTBK5AEDO0BeWloZ3bStvWU d188Huk6R+9GFaAJyJ7oV2V1SV3WSRQVvY10YW16fFSWcTARMb6xMbyoAS0WQp7q 6w5cD1sr+rnwmgGmSKhMOrp6dfWzwma7tk66BXcd7zjT8JoI7+7Qniz2LFuG6zgW uIQIpfhdDE9eGShkZriguU8o0ZVojjg3K1ubf9gsmMxvs6yneUYCRS6MjjYAXccS HJALmJIn6YAcS6MBa0lXkHNxBBYHnmWNZjNhsyLuPj+TSh8xM//cayiT6ySURGSb 4/uK8cgkqm8QUBbLZTCN8Lv/S3Kx/o37GyujteJHs+2CLLoAe837dqcu6krPtWpA tPM3a++y5D3c5MpFG0qP2ZXRQkhlZtZJHj1gR2/hRWtRItaLd+n5iDCte+tw5f6T 5ld921LkMPR43ratmvHH6GlsKwPh3pqU7dH8s8viJAR2h4EcxQhxACcAHjpv5ByO Ia/F1xe5TUG0UY9CEBgA =SI7R -----END PGP SIGNATURE-----

2 1

Re: [resend 1/5] ddraw: check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority
by Henri Verbeet Nov. 5, 2015

Nov. 5, 2015

On 4 November 2015 at 19:51, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) > + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)) Please don't add lines longer than 120 characters. (And aim for about 100.)

2 1