December 2016 - Wine-Commits

Andrey Gusev : change variable
by Jeremy Newman Dec. 30, 2016

Dec. 30, 2016

Module: appdb Branch: master Commit: b00e068c949030a14a3e827632a59ff160ef2dd4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b00e068c949030a14a3e8276… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 28 19:02:44 2016 +0200 change variable Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/bugs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bugs.php b/include/bugs.php index 7427a31..f8c3f41 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -749,7 +749,7 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) echo "<td>".$oBuglink->sShort_desc."</td>\n"; echo "<td class=\"text-center\">".$oBuglink->sBug_status."</td>","\n"; echo "<td class=\"text-center\">".$oBuglink->sResolution."</td>","\n"; - echo "<td class=\"text-center\"><a href=\"viewbugs.php?bug_id={$oBuglink->iBug_id}\" class=\"btn btn-default\">View</a></td>\n"; + echo "<td class=\"text-center\"><a href=\"viewbugs.php?iBugId={$oBuglink->iBug_id}\" class=\"btn btn-default\">View</a></td>\n"; if($bCanEdit == true) {

1 0

Bruno Jesus : Update the Portuguese version of Downloads page
by Jeremy Newman Dec. 30, 2016

Dec. 30, 2016

Module: website Branch: master Commit: 97de8f8511fe9b15304679bf79839ef1a815e0ee URL: http://source.winehq.org/git/website.git/?a=commit;h=97de8f8511fe9b15304679… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 29 02:15:39 2016 -0200 Update the Portuguese version of Downloads page Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/pt/download.template | 306 +++++++++++++++++++++-------------------- 1 file changed, 159 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=97de8f8511fe9b1530…

1 0

Piotr Caban : msvcp110: Add _Facet_base_vtable export.
by Alexandre Julliard Dec. 27, 2016

Dec. 27, 2016

Module: wine Branch: master Commit: d8c5ef33090fb0ebac62a4fe9e8622a98a50dc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c5ef33090fb0ebac62a4fe9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 27 14:23:49 2016 +0100 msvcp110: Add _Facet_base_vtable export. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/locale.c | 8 +++++++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index e890257..b09a1d4 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable -# extern ??_7_Facet_base(a)std@@6B@ +@ extern ??_7_Facet_base(a)std@@6B@ MSVCP__Facet_base_vtable @ extern ??_7_Locimp(a)locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Pad(a)std@@6B@ MSVCP__Pad_vtable @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 33812b9..863ead9 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable -# extern ??_7_Facet_base(a)std@@6B@ +@ extern ??_7_Facet_base(a)std@@6B@ MSVCP__Facet_base_vtable @ extern ??_7_Locimp(a)locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Pad(a)std@@6B@ MSVCP__Pad_vtable @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 265d2be..438cddb 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ -# extern ??_7_Facet_base(a)std@@6B@ +@ extern ??_7_Facet_base(a)std@@6B@ msvcp120.??_7_Facet_base(a)std@@6B@ @ extern ??_7_Locimp(a)locale@std@@6B@ msvcp120.??_7_Locimp(a)locale@std@@6B@ @ extern ??_7_Pad(a)std@@6B@ msvcp120.??_7_Pad(a)std@@6B@ @ extern ??_7codecvt_base(a)std@@6B@ msvcp120.??_7codecvt_base(a)std@@6B@ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 36e2cad..fb3d709 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -954,7 +954,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable -# extern ??_7_Facet_base(a)std@@6B@ +@ extern ??_7_Facet_base(a)std@@6B@ MSVCP__Facet_base_vtable @ extern ??_7_Locimp(a)locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable @ extern ??_7ctype_base(a)std@@6B@ MSVCP_ctype_base_vtable diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index fe5bd33..d2fce47 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11224,7 +11224,7 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s } #endif - +DEFINE_RTTI_DATA0(_Facet_base, 0, ".?AV_Facet_base(a)std@@") DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@") DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp(a)locale@std@@") DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)D@std@@") @@ -11262,6 +11262,11 @@ DEFINE_RTTI_DATA2(time_get_char, 0, &time_base_rtti_base_descriptor, &locale_fac #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(_Facet_base, + VTABLE_ADD_FUNC(locale_facet_vector_dtor) + VTABLE_ADD_FUNC(locale_facet__Incref) + VTABLE_ADD_FUNC(locale_facet__Incref) + ); __ASM_VTABLE(locale_facet, VTABLE_ADD_FUNC(locale_facet_vector_dtor) #if _MSVCP_VER >= 110 @@ -11608,6 +11613,7 @@ void __asm_dummy_vtables(void) { void init_locale(void *base) { #ifdef __x86_64__ + init__Facet_base_rtti(base); init_locale_facet_rtti(base); init_locale__Locimp_rtti(base); init_collate_char_rtti(base);

1 0

Piotr Caban : msvcrt: Pass correct buffer size to snwprintf in DoMessageBoxW helper.
by Alexandre Julliard Dec. 27, 2016

Dec. 27, 2016

Module: wine Branch: master Commit: 7ba79ca9d2e67e92fc39f46a606583bfb7c99798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba79ca9d2e67e92fc39f46a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 27 14:09:36 2016 +0100 msvcrt: Pass correct buffer size to snwprintf in DoMessageBoxW helper. Spotted by Nikolay. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 318bafb..9fd373e 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -121,7 +121,8 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess MSVCRT_wchar_t text[2048]; INT ret; - MSVCRT__snwprintf(text,sizeof(text),message_format, lead, MSVCRT__wpgmptr, message); + MSVCRT__snwprintf(text, sizeof(text)/sizeof(text[0]), message_format, + lead, MSVCRT__wpgmptr, message); msgbox.cbSize = sizeof(msgbox); msgbox.hwndOwner = GetActiveWindow();

1 0

Alexandre Julliard : gdi32: Support PALETTEINDEX colors for 1-bpp DIB blits.
by Alexandre Julliard Dec. 27, 2016

Dec. 27, 2016

Module: wine Branch: master Commit: c0b30432ea76334811e43ccef14a7190fbce4a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b30432ea76334811e43ccef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 16:08:44 2016 +0100 gdi32: Support PALETTEINDEX colors for 1-bpp DIB blits. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 43 ++++++++++++++++++++++++++++--------------- dlls/gdi32/tests/dib.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 3a8f0f4..8c2e815 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -221,25 +221,38 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits return blend_bitmapinfo( src_info, src_bits->ptr, src, dst_info, dst_bits->ptr, dst, blend ); } -/* helper to retrieve either both colors or only the background color for monochrome blits */ -void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) +static RGBQUAD get_dc_rgb_color( DC *dc, COLORREF color ) { - RGBQUAD *colors = info->bmiColors; - COLORREF color = dc->backgroundColor; - - colors[count - 1].rgbRed = GetRValue( color ); - colors[count - 1].rgbGreen = GetGValue( color ); - colors[count - 1].rgbBlue = GetBValue( color ); - colors[count - 1].rgbReserved = 0; + RGBQUAD ret = { 0, 0, 0, 0 }; - if (count > 1) + if (color & (1 << 24)) /* PALETTEINDEX */ { - color = dc->textColor; - colors[0].rgbRed = GetRValue( color ); - colors[0].rgbGreen = GetGValue( color ); - colors[0].rgbBlue = GetBValue( color ); - colors[0].rgbReserved = 0; + PALETTEENTRY pal; + + if (!GetPaletteEntries( dc->hPalette, LOWORD(color), 1, &pal )) + GetPaletteEntries( dc->hPalette, 0, 1, &pal ); + ret.rgbRed = pal.peRed; + ret.rgbGreen = pal.peGreen; + ret.rgbBlue = pal.peBlue; + return ret; } + if (color >> 16 == 0x10ff) /* DIBINDEX */ + { + /* FIXME: need to propagate the index into the conversion functions */ + WARN( "monochrome blit uses DIBINDEX %x\n", color ); + return ret; + } + ret.rgbRed = GetRValue( color ); + ret.rgbGreen = GetGValue( color ); + ret.rgbBlue = GetBValue( color ); + return ret; +} + +/* helper to retrieve either both colors or only the background color for monochrome blits */ +void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) +{ + info->bmiColors[count - 1] = get_dc_rgb_color( dc, dc->backgroundColor ); + if (count > 1) info->bmiColors[0] = get_dc_rgb_color( dc, dc->textColor ); info->bmiHeader.biClrUsed = count; } diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 9db74fe..bf3e77c 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -130,6 +130,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "aaf62842bb98d8a2945c4f643baf50afaeea9307", "d7e34fa02db7ad52327f80389bd1ba1b72b6c692", "d7dd4700f49808541bba99244b7eb5840e0a2439", + "00b4e9b243a36a7210a48bcb7c2d410d9cd8c8c7", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", "a37810f46dee8741fe5adbb3f1f2e87012ffc929", @@ -203,6 +204,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "aaf62842bb98d8a2945c4f643baf50afaeea9307", "d7e34fa02db7ad52327f80389bd1ba1b72b6c692", "d7dd4700f49808541bba99244b7eb5840e0a2439", + "00b4e9b243a36a7210a48bcb7c2d410d9cd8c8c7", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", "a37810f46dee8741fe5adbb3f1f2e87012ffc929", @@ -276,6 +278,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "118bf4c5bddc206ba737f7aa8b239940cd1aadc2", "eac5d164b83edf2cf85bac242686f9f617ec1fa4", "86c84cc8306975edecc6d4a89a8aff29f59b55a7", + "698d6393e97539806351368f95be478c6fbc62b0", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "25675c30adfe24d6cae60793b156dfdaa36ac3ba", "849d4abf4b690128a5f70e9b8ac78f20c437de06", @@ -349,6 +352,7 @@ static const char *sha1_graphics_r10g10b10[] = "43d67bc61ef54014b022891e5c024fc24b1fe797", "5a713a91fd471fd331bd13b0868c994aa2ffe2b2", "fc0c32afb719295f28bcfef22803bef94f798e20", + "bb2a421bab95f9b5420704ef44c0f3214a0b5a11", "36f6db4fbe2a1630a7597d3a446f2902755c96ef", "d3f08946300e1700865042aed121870e292d1095", "4782df8e24127e66a434b4e839adebf2dbb223fb", @@ -422,6 +426,7 @@ static const char *sha1_graphics_r6g6b6[] = "cd01f2c0a63b2229d4467d2f874d58edca32b3d4", "8ad5cd520cd628b76d2e5a3f318ae1bbb6b4c994", "49341c297a887186bd47d7465d827ab3147f05e3", + "514c07281ef6702c35e68b230e897303a8cdec81", "325279e76367200d3fd7194d81c09fd139988ece", "c3def160a1e847605ff0fc7edd30397fa90635a0", "2b3e87e0b705b03c7c08f403409ab82cce095ba1", @@ -495,6 +500,7 @@ static const char *sha1_graphics_24[] = "1015e0217ea13eaa62c7666b8b81aafd75f8f610", "5578c80048520732557abf3a3a3fa22c85015d7d", "b25ba91487ec945410deb2b51bc1156890c032a8", + "4c8c936372755f95051f1159b7ff65a484e1a555", "d347ca5c6c4b6a61389247c3b6f61564033e8c25", "ee315634ed92da3a32c2675ecd1b369471c60936", "099c688a920f606655b485e8f0a433dc811bc976", @@ -572,6 +578,7 @@ static const char *sha1_graphics_r5g5b5[] = "a7506e2c001d271593297c9eda9b984d4d894774", "8f447a3820c83662086dfa836da2205b0130fd5f", "3772003c7fb420003512d0c437b3659d96d89ce4", + "2ebf37d81da3f11434652d06bf65d55e96b090aa", "dab47c9dc149e570045d699598b14a613bf319b3", "2daca4d26a086ed34894693be0b0374402232809", "904f1d82159bcf5485f323bd12b859dc5e83f8eb", @@ -644,6 +651,7 @@ static const char *sha1_graphics_r4g4b4[] = "9af4907a8144458a73dbb7471784f8c3d9aeffcf", "104e85bad287a62dfe25f0e78280179f18bac765", "f0acb3cfcda62e95bee5f7bc8830ffeb3dd7e5a7", + "fde993dfce1551ef220f5a07ce4acd66e8524ac5", "07b10c3f191d0a93e5e5694aae37dcad407e10f5", "f7900e60347029876ba55e8f0c4c02e89deb36b6", "f373a5f37b82e7523c64c08eb509b6191e49b173", @@ -722,6 +730,7 @@ static const char *sha1_graphics_8_color[] = "f3dc739da41fb299637c8660e8c46917ddcf87a8", "abd2fff80f74b311072ecdb91ce9ceba268fa6e9", "9ae38bb94c7b4c0c6dfebbee23d1de4db9b77488", + "8269b32b4a34440f1fa37927308debc7eb85f3fa", "678979a45126a76eb629992cd64734862f53a555", "2f7ba8803604c032cb1a1228bc021f0f1c03e245", "52e7c2f8b01592898c13f1e7633881e350244209", @@ -804,6 +813,7 @@ static const char *sha1_graphics_8_grayscale[] = "a1a941fa270cda48c648553ed4b427e16e96f8e0", "115c90df05b1ff754dbdfe2a712ef126034d952d", "fb63bbb2f944fb63ed2d7399f07b168740c1034b", + "ae45f0d463ff916f3cb630103969fd49e8d09ef4", "3685c9ae95118a83db3569832c29753276fa1264", "09640bad951c33e7d70a1fced83b1869f65b3fc5", "5eb00252664ec39e61359adb1dade4906a87a248", @@ -881,6 +891,7 @@ static const char *sha1_graphics_8[] = "7d1bfff706b0713e53209407889f83a0da26a81d", "5a1d8f9ea978b820edbc5c9e1c6f1cac022620ad", "31e667c2dbb81dcf81d01cb88f794e88ddb90ff2", + "c404446958788fac00ee1eff571d682bc21dd7ac", "465d9cd0a77ab4fcf035aa67544b2a26269e0b09", "600d6b2713d5e4c0d90c02660245ed26c7ae3033", "0025a440866a404523a8a20e79a8891e45a2ff56", @@ -953,6 +964,7 @@ static const char *sha1_graphics_4[] = "46760975993f9881b7bbe94123173e6a683d3f25", "c644f460937107214a88d5eb9e846d27abd8c874", "df5feb905a31c288008cf5e82d73ac818a160d82", + "4f9658dde0432a711a4d783c1b5aa3365fb7d54b", "d8af3868c66c7d6dac35ec8ee0317b38a6910bb1", "ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951", "ccf8d11b1e81895e9781f17c227c821228d8714b", @@ -1025,6 +1037,7 @@ static const char *sha1_graphics_4_grayscale[] = "5eeb56afea8040a8fb18c11f29931b836474126d", "30c256a783c4874261667bb31307eb282ab9470e", "f8681c09f1abfc38d31e47622cb8798cd896a00e", + "0ba7e5d68419702605739acb52fcc01c96cb63d4", "b5ee51cfc73acb59a2f6124509ea236f8fc7f9f7", "d374d4d92c940ae42a9b42c14d744341b68a8c14", "06a6a224be0f5cdc51ac4704f9f57fc1f3813d6f", @@ -1115,6 +1128,7 @@ static const char *sha1_graphics_1[] = "a2a928de9007d765da496abec8c21b23601f8c45", "41a417c1f25f2619301afa44bfcde85198985792", "23366004515f3bc46796ea505d748f8d0f97fbe1", + "ba682eb15c0ddffb942e6086e0ccad2353ed7241", "88763f8e8fcf4f78fa864325791a9dd35a0bd279", "013cee26bac8f815eadad4bfc012d9b5d01c3b7f", "44a28536466dc895feb824b23dfd4a47c6948af8", @@ -1189,6 +1203,7 @@ static const RECT graphics_bounds[] = { 100, 100, 356, 356 }, { 10, 10, 356, 356 }, { 100, 100, 356, 356 }, + { 0, 0, 260, 39 }, { 10, 10, 416, 26 }, { 10, 8, 60, 104 }, { 0, 10, 511, 306 }, @@ -2420,6 +2435,36 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) else compare_hash(hdc, bmi, bits, "AlphaBlend src 1-bpp" ); } + /* blitting with 1-bpp ddb source */ + + bmp = CreateBitmap( 16, 16, 1, 1, ddb_brush_bits ); + DeleteObject( SelectObject( src_dc, bmp ) ); + + old_text = GetTextColor( hdc ); + old_bkgnd = GetBkColor( hdc ); + for (i = 0; i < 256; i += 13) + { + SetTextColor(hdc, RGB( i, 2*i, 255 - i ) ); + SetBkColor(hdc, RGB( 255 - i, i / 3, i ) ); + BitBlt( hdc, i, 0, 13, 13, src_dc, 0, 0, SRCCOPY ); + } + for (i = 0; i < 256; i += 13) + { + SetTextColor(hdc, PALETTEINDEX( i )); + SetBkColor(hdc, PALETTEINDEX( i + 3 )); + BitBlt( hdc, i, 13, 13, 13, src_dc, 0, 0, SRCCOPY ); + } + for (i = 0; i < 256; i += 13) + { + SetTextColor(hdc, DIBINDEX( i )); + SetBkColor(hdc, DIBINDEX( i + 3 )); + BitBlt( hdc, i, 26, 13, 13, src_dc, 0, 0, SRCCOPY ); + } + SetTextColor( hdc, old_text ); + SetBkColor( hdc, old_bkgnd ); + compare_hash_broken_todo(hdc, bmi, bits, "BitBlt src 1-bpp ddb SRCCOPY", 0, + bmi->bmiHeader.biBitCount <= 8 /* todo: DIBINDEX for indexed formats */ ); + DeleteDC( src_dc ); DeleteObject( bmp );

1 0

Nikolay Sivov : ole32/tests: Some tests for returned apartment type in implicit MTA case.
by Alexandre Julliard Dec. 27, 2016

Dec. 27, 2016

Module: wine Branch: master Commit: 3e2ed9c7617cdf43db39fad51f970cb9a2cd42fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2ed9c7617cdf43db39fad51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 25 01:19:07 2016 +0300 ole32/tests: Some tests for returned apartment type in implicit MTA case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b8bdaff..4468ad9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -617,6 +617,26 @@ static DWORD CALLBACK ole_initialize_thread(LPVOID pv) return hr; } +#define test_apt_type(t, q, t_t, t_q) _test_apt_type(t, q, t_t, t_q, __LINE__) +static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qualifier, BOOL todo_type, + BOOL todo_qualifier, int line) +{ + APTTYPEQUALIFIER qualifier = ~0u; + APTTYPE type = ~0u; + HRESULT hr; + + if (!pCoGetApartmentType) + return; + + hr = pCoGetApartmentType(&type, &qualifier); + ok_(__FILE__, line)(hr == S_OK || hr == CO_E_NOTINITIALIZED, "Unexpected return code: 0x%08x\n", hr); +todo_wine_if(todo_type) + ok_(__FILE__, line)(type == expected_type, "Wrong apartment type %d, expected %d\n", type, expected_type); +todo_wine_if(todo_qualifier) + ok_(__FILE__, line)(qualifier == expected_qualifier, "Wrong apartment qualifier %d, expected %d\n", qualifier, + expected_qualifier); +} + static void test_CoCreateInstance(void) { HRESULT hr; @@ -661,6 +681,8 @@ static void test_CoCreateInstance(void) /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -672,6 +694,8 @@ static void test_CoCreateInstance(void) ok( !WaitForSingleObject(info.wait, 10000 ), "wait timed out\n" ); + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + pUnk = (IUnknown *)0xdeadbeef; hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); ok(hr == S_OK, "CoCreateInstance should have returned S_OK instead of 0x%08x\n", hr); @@ -687,6 +711,8 @@ static void test_CoCreateInstance(void) CloseHandle(thread); CloseHandle(info.wait); CloseHandle(info.stop); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); } static void test_CoGetClassObject(void) @@ -713,6 +739,8 @@ static void test_CoGetClassObject(void) /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -724,6 +752,8 @@ static void test_CoGetClassObject(void) ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + pUnk = (IUnknown *)0xdeadbeef; hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); if(hr == REGDB_E_CLASSNOTREG) @@ -745,6 +775,8 @@ static void test_CoGetClassObject(void) CloseHandle(info.wait); CloseHandle(info.stop); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + if (!pRegOverridePredefKey) { win_skip("RegOverridePredefKey not available\n"); @@ -1798,6 +1830,8 @@ static void test_CoGetObjectContext(void) /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -1809,6 +1843,8 @@ static void test_CoGetObjectContext(void) ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + pComThreadingInfo = NULL; hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); @@ -1842,8 +1878,12 @@ static void test_CoGetObjectContext(void) CloseHandle(info.wait); CloseHandle(info.stop); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok_ole_success(hr, "CoGetObjectContext"); @@ -2028,6 +2068,8 @@ static void test_CoGetContextToken(void) /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -2039,6 +2081,8 @@ static void test_CoGetContextToken(void) ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + token = 0; hr = pCoGetContextToken(&token); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); @@ -2059,8 +2103,12 @@ static void test_CoGetContextToken(void) CloseHandle(info.wait); CloseHandle(info.stop); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + CoInitialize(NULL); + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + hr = pCoGetContextToken(NULL); ok(hr == E_POINTER, "Expected E_POINTER, got 0x%08x\n", hr);

1 0

Alexandre Julliard : Wine release 2.0-rc3
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: website Branch: master Commit: af89816b033a66f8d0dbd4636611b683699a75cc URL: http://source.winehq.org/git/website.git/?a=commit;h=af89816b033a66f8d0dbd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 23 20:54:10 2016 +0100 Wine release 2.0-rc3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016122301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2016122301.xml b/news/en/2016122301.xml new file mode 100644 index 0000000..3a4b705 --- /dev/null +++ b/news/en/2016122301.xml @@ -0,0 +1,12 @@ +<news> +<date>December 23, 2016</date> +<title>Wine 2.0-rc3 Released</title> +<body> + The Wine development release 2.0-rc3 is now available. + <a href="{$root}/announce/2.0-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Hugh McMaster : msvcrt: Fix typo in message_format array.
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: 87c1ce80f3aef5d2b6b0aae429a91e383ef6dae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c1ce80f3aef5d2b6b0aae42… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 23 11:38:56 2016 +0000 msvcrt: Fix typo in message_format array. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 2034ddf..318bafb 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -113,7 +113,7 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess static const MSVCRT_wchar_t message_format[] = {'%','s','\n','\n','P','r','o','g','r','a','m',':',' ','%','s','\n', '%','s','\n','\n','P','r','e','s','s',' ','O','K',' ','t','o',' ','e','x','i','t',' ','t','h','e',' ', 'p','r','o','g','r','a','m',',',' ','o','r',' ','C','a','n','c','e','l',' ','t','o',' ','s','t','a','r','t',' ', - 't','h','e',' ','W','i','n','e',' ','d','e','b','b','u','g','e','r','.','\n',0}; + 't','h','e',' ','W','i','n','e',' ','d','e','b','u','g','g','e','r','.','\n',0}; static const WCHAR title[] = {'W','i','n','e',' ','C','+','+',' ','R','u','n','t','i','m','e',' ','L','i','b','r','a','r','y',0};

1 0

Tag wine-2.0-rc3 : Alexandre Julliard : Release 2.0-rc3
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: refs/tags/wine-2.0-rc3 Tag: 90f249050cda178bcb67bcab4c0e2eeb75e288f6 URL: http://source.winehq.org/git/wine.git/?a=tag;h=90f249050cda178bcb67bcab4c0e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 23 20:52:14 2016 +0100 Release 2.0-rc3

1 0

Alexandre Julliard : Release 2.0-rc3.
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: 80d2edd5845c09b98cb5b6b7779b4455dfbc1095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d2edd5845c09b98cb5b6b77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 23 20:52:13 2016 +0100 Release 2.0-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 178 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +++---- 3 files changed, 98 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80d2edd5845c09b98cb5b…

1 0