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

Alexandre Julliard : winedump: Add dumping for exception info for ARM64.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 509e8d2093c4a54ce29a4cc668fc1318114b93ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=509e8d2093c4a54ce29a4cc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 20 20:21:57 2019 +0200 winedump: Add dumping for exception info for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 364 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 358 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=509e8d2093c4a54ce29a…

1 0

Brendan Shanks : dinput/tests: Test for correct guidProduct.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: 50785992d07b2ef7d1eefe1bf1180535be16b96b URL: https://source.winehq.org/git/wine.git/?a=commit;h=50785992d07b2ef7d1eefe1b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Aug 13 14:40:37 2019 -0700 dinput/tests: Test for correct guidProduct. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index c570ecf..5947b17 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -386,6 +386,30 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo wine_dbgstr_guid(&instance->guidProduct)); } + if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD) + ok(IsEqualGUID(&instance->guidProduct, &GUID_SysKeyboard), + "Keyboard guidProduct (%s) does not match GUID_SysKeyboard (%s)\n", + wine_dbgstr_guid(&instance->guidProduct), + wine_dbgstr_guid(&GUID_SysMouse)); + else if ((instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) + ok(IsEqualGUID(&instance->guidProduct, &GUID_SysMouse), + "Mouse guidProduct (%s) does not match GUID_SysMouse (%s)\n", + wine_dbgstr_guid(&instance->guidProduct), + wine_dbgstr_guid(&GUID_SysMouse)); + else { + /* Non-keyboard/mouse devices use the "PIDVID" guidProduct */ + static const GUID pidvid_product_guid = { /* device_pidvid-0000-0000-0000-504944564944 "PIDVID" */ + 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} + }; + + ok(instance->guidProduct.Data2 == pidvid_product_guid.Data2, + "guidProduct.Data2 is %04x\n", instance->guidProduct.Data2); + ok(instance->guidProduct.Data3 == pidvid_product_guid.Data3, + "guidProduct.Data3 is %04x\n", instance->guidProduct.Data3); + ok(!memcmp(instance->guidProduct.Data4, pidvid_product_guid.Data4, sizeof(pidvid_product_guid.Data4)), + "guidProduct.Data4 does not match: %s\n", wine_dbgstr_guid(&instance->guidProduct)); + } + enum_test->device_count++; return enum_test->return_value; }

1 0

Brendan Shanks : dinput: Add "PIDVID" guidProduct and use for non-keyboards/mice.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: d2d3959d3d29b3da334b53283b34cafde653b3e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d3959d3d29b3da334b5328… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Aug 13 14:40:38 2019 -0700 dinput: Add "PIDVID" guidProduct and use for non-keyboards/mice. Windows uses an undocumented GUID (ending in ASCII "PIDVID") for non-keyboard/mouse devices. Various games (DiRT Rally 2) and libraries (SDL, GLFW) look for this GUID to match specific devices or know that the PID/VID can be extracted. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device_private.h | 2 ++ dlls/dinput/joystick.c | 8 ++++++++ dlls/dinput/joystick_linux.c | 15 +-------------- dlls/dinput/joystick_linuxinput.c | 15 +-------------- dlls/dinput/joystick_osx.c | 6 +++--- 5 files changed, 15 insertions(+), 31 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index d9e2997..27e9c26 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -114,6 +114,8 @@ typedef struct LPDIRECTINPUTEFFECT ref; } effect_list_item; +extern const GUID DInput_PIDVID_Product_GUID DECLSPEC_HIDDEN; + /* Various debug tools */ extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) DECLSPEC_HIDDEN; extern void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index a5308b6..2220b5d 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -52,6 +52,14 @@ static const WORD PID_XBOX_CONTROLLERS[] = { 0x0719, /* Xbox 360 Wireless Adapter */ }; +/* Windows uses this GUID for guidProduct on non-keyboard/mouse devices. + * Data1 contains the device VID (low word) and PID (high word). + * Data4 ends with the ASCII bytes "PIDVID". + */ +const GUID DInput_PIDVID_Product_GUID = { /* device_pidvid-0000-0000-0000-504944564944 */ + 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} +}; + static inline JoystickGenericImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8A_iface), JoystickGenericImpl, base); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 7e01f90..4ee7397 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -126,19 +126,6 @@ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903 {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; -/* - * Construct the GUID in the same way of Windows doing this. - * Data1 is concatenation of productid and vendorid. - * Data2 and Data3 are NULL. - * Data4 seems to be a constant. - */ -static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { - 0x000000000, - 0x0000, - 0x0000, - {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} -}; - #define MAX_JOYSTICKS 64 static INT joystick_devices_count = -1; static struct JoyDev *joystick_devices; @@ -327,7 +314,7 @@ static INT find_joystick_devices(void) else { /* Concatenate product_id with vendor_id to mimic Windows behaviour */ - joydev.guid_product = DInput_Wine_Joystick_Constant_Part_GUID; + joydev.guid_product = DInput_PIDVID_Product_GUID; joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 1e8c542..b5418d8 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -165,19 +165,6 @@ static const GUID DInput_Wine_Joystick_Base_GUID = { /* 9e573eda-7734-11d2-8d4a- {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; -/* - * Construct the GUID in the same way of Windows doing this. - * Data1 is concatenation of productid and vendorid. - * Data2 and Data3 are NULL. - * Data4 seems to be a constant. - */ -static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { - 0x000000000, - 0x0000, - 0x0000, - {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} -}; - #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) #define MAX_JOYDEV 64 @@ -344,7 +331,7 @@ static void find_joydevs(void) joydev.bus_type = device_id.bustype; /* Concatenate product_id with vendor_id to mimic Windows behaviour */ - joydev.guid_product = DInput_Wine_Joystick_Constant_Part_GUID; + joydev.guid_product = DInput_PIDVID_Product_GUID; joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 884dd7f..990f5d1 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -985,7 +985,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; + lpddi->guidProduct = DInput_PIDVID_Product_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); lpddi->dwDevType = get_device_type(version, is_joystick); lpddi->dwDevType |= DIDEVTYPE_HID; @@ -1033,7 +1033,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; + lpddi->guidProduct = DInput_PIDVID_Product_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); lpddi->dwDevType = get_device_type(version, is_joystick); lpddi->dwDevType |= DIDEVTYPE_HID; @@ -1109,7 +1109,7 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, newDevice->generic.guidInstance = DInput_Wine_OsX_Joystick_GUID; newDevice->generic.guidInstance.Data3 = index; - newDevice->generic.guidProduct = DInput_Wine_OsX_Joystick_GUID; + newDevice->generic.guidProduct = DInput_PIDVID_Product_GUID; newDevice->generic.guidProduct.Data1 = make_vid_pid(device); newDevice->generic.joy_polldev = poll_osx_device_state;

1 0

Fabian Maurer : find/tests: First tests.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: wine Branch: master Commit: a64b9c93b1eeef151221b5a100547fdae85435f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a64b9c93b1eeef151221b5a1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Aug 12 23:37:02 2019 +0200 find/tests: First tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + programs/find/tests/Makefile.in | 5 + programs/find/tests/find.c | 316 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 323 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a64b9c93b1eeef151221…

1 0

Francois Gouget : winetest: Add test instructions in the dissect and gather scripts.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: tools Branch: master Commit: 01ac22970306e3593a36c2a8b688bb9ab663d2d7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=01ac22970306e3593a36c2a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 20 12:08:22 2019 +0200 winetest: Add test instructions in the dissect and gather scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 6 ++++++ winetest/gather | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index a468812..2bd95eb 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -26,6 +26,12 @@ # where DIGIT is for resolving name clashes and data/BUILD/outdated is # created to signal the change in the given build. # +# To test this script: +# - Make sure $workdir is not set in winetest.conf +# - Put a test report in queue/rep1/report +# - Run ./dissect +# - Examine the result in data/ +# # Exit: 0 - successfully processed a report, call again # 1 - failed to process a report, call again # 2 - there was nothing to do diff --git a/winetest/gather b/winetest/gather index a894377..31ba8fa 100755 --- a/winetest/gather +++ b/winetest/gather @@ -25,6 +25,11 @@ # script. Races and concurrency problems must be dealt with on that higher # level. # +# To test this script: +# - Make sure $workdir is not set in winetest.conf +# - After running dissect, run ./gather +# - Examine the result in data/ +# # Exit: 0 - successfully processed a build, call again # 1 - should not happen # 2 - there was nothing to do

1 0

Francois Gouget : winetest: Tweak dissect to better match the TestBot WineTest log parser.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: tools Branch: master Commit: fe8341c87adc6bb18172e0341fc733cccec579a9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fe8341c87adc6bb18172e03… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 20 12:08:59 2019 +0200 winetest: Tweak dissect to better match the TestBot WineTest log parser. This puts exception handling in the same relative spot, making it easier to compare the two codebases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2bd95eb..e5b2815 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -609,21 +609,6 @@ while ($line = <IN>) { $rc = 0; } } - elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or - ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) - { - my ($l_pid, $l_unit) = ($1, $2); - if ($l_unit eq $unit) - { - # This also replaces a test summary line. - $pids{$l_pid || 0} = 1; - $s_failures++; - } - add_test_line("failed", escapeHTML($line)); - check_unit($l_unit, "unhandled exception"); - $failures++; - } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/ or ($unit ne "" and $line =~ /^(.*?)($unit)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) @@ -664,6 +649,21 @@ while ($line = <IN>) { get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); } + elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or + ($unit ne "" and + $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) + { + my ($l_pid, $l_unit) = ($1, $2); + if ($l_unit eq $unit) + { + # This also replaces a test summary line. + $pids{$l_pid || 0} = 1; + $s_failures++; + } + add_test_line("failed", escapeHTML($line)); + check_unit($l_unit, "unhandled exception"); + $failures++; + } elsif ($line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($unit ne "" and $line =~ /(?:([0-9a-f]+):)?($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./))

1 0

Francois Gouget : testbot: Remove support for TestAgent's old "skipped" lines.
by Alexandre Julliard 20 Aug '19

20 Aug '19

Module: tools Branch: master Commit: 3e38ebfe6bfeb32dd1db0f73dfb7964ff4ac4ae5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3e38ebfe6bfeb32dd1db0f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 20 12:08:48 2019 +0200 testbot: Remove support for TestAgent's old "skipped" lines. TestAgent was fixed a couple of years ago so the TestBot should not have to deal with such lines anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index b75607a..3dca2e4 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -351,16 +351,14 @@ sub ParseWineTestReport($$$) _CheckUnit($Parser, $Cur, $1, "todo"); $Cur->{LineTodos}++; } - # TestLauncher's skip message is quite broken - elsif ($Line =~ /^([_a-z0-9]+)(?:\.c)?:\d+:? Tests? skipped: / or + elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})(?:\.c)?:\d+:? Tests? skipped: /)) + $Line =~ /($Cur->{Unit})\.c:\d+: Tests skipped: /)) { my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they - # are misreported (see _CloseTestUnit). Also TestLauncher uses the wrong - # name in its skip message when skipping tests. - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "" or $Unit eq $Cur->{Dll}) + # are misreported (see _CloseTestUnit). + if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") { $Cur->{LineSkips}++; } @@ -396,9 +394,8 @@ sub ParseWineTestReport($$$) my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); # Dlls that have only one test unit will run it even if there is - # no argument. Also TestLauncher uses the wrong name in its test - # summary line when skipping tests. - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "" or $Unit eq $Cur->{Dll}) + # no argument. + if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") { # There may be more than one summary line due to child processes $Cur->{Pids}->{$Pid || 0} = 1;

1 0

Huw Davies : riched20: Move release_font_cache() further up the file.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: da9bc7cd9585a0d1554b8119b692ec6235037ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da9bc7cd9585a0d1554b8119… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 19 10:55:27 2019 +0100 riched20: Move release_font_cache() further up the file. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/style.c | 105 ++++++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 50 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 1be1c15..fca0cef 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -357,64 +357,69 @@ static BOOL ME_IsFontEqual(const LOGFONTW *p1, const LOGFONTW *p2) return TRUE; } -HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) +static void release_font_cache(ME_FontCacheItem *item) { - HFONT hOldFont; - LOGFONTW lf; - int i, nEmpty, nAge = 0x7FFFFFFF; - ME_FontCacheItem *item; - assert(s); - - ME_LogFontFromStyle(c, &lf, s); - - for (i=0; i<HFONT_CACHE_SIZE; i++) - c->editor->pFontCache[i].nAge++; - for (i=0, nEmpty=-1, nAge=0; i<HFONT_CACHE_SIZE; i++) - { - item = &c->editor->pFontCache[i]; - if (!item->nRefs) + if (item->nRefs > 0) { - if (item->nAge > nAge) - nEmpty = i, nAge = item->nAge; - } - if (item->hFont && ME_IsFontEqual(&item->lfSpecs, &lf)) - break; - } - if (i < HFONT_CACHE_SIZE) /* found */ - { - item = &c->editor->pFontCache[i]; - TRACE_(richedit_style)("font reused %d\n", i); - item->nRefs++; - } - else - { - item = &c->editor->pFontCache[nEmpty]; /* this legal even when nEmpty == -1, as we don't dereference it */ - - assert(nEmpty != -1); /* otherwise we leak cache entries or get too many fonts at once*/ - if (item->hFont) { - TRACE_(richedit_style)("font deleted %d\n", nEmpty); - DeleteObject(item->hFont); - item->hFont = NULL; + item->nRefs--; + item->nAge = 0; } - item->hFont = CreateFontIndirectW(&lf); - TRACE_(richedit_style)("font created %d\n", nEmpty); - item->nRefs = 1; - item->lfSpecs = lf; - } - s->font_cache = item; - hOldFont = SelectObject(c->hDC, item->hFont); - /* should be cached too, maybe ? */ - GetTextMetricsW(c->hDC, &s->tm); - return hOldFont; } -static void release_font_cache(ME_FontCacheItem *item) +HFONT ME_SelectStyleFont( ME_Context *c, ME_Style *s ) { - if (item->nRefs > 0) + HFONT old_font; + LOGFONTW lf; + int i, empty, age = 0x7FFFFFFF; + ME_FontCacheItem *item; + + assert( s ); + + ME_LogFontFromStyle( c, &lf, s ); + + for (i = 0; i < HFONT_CACHE_SIZE; i++) + c->editor->pFontCache[i].nAge++; + for (i = 0, empty = -1, age = 0; i < HFONT_CACHE_SIZE; i++) { - item->nRefs--; - item->nAge = 0; + item = &c->editor->pFontCache[i]; + if (!item->nRefs) + { + if (item->nAge > age) + { + empty = i; + age = item->nAge; + } + } + + if (item->hFont && ME_IsFontEqual( &item->lfSpecs, &lf )) + break; + } + + if (i < HFONT_CACHE_SIZE) /* found */ + { + item = &c->editor->pFontCache[i]; + TRACE_(richedit_style)( "font reused %d\n", i ); + item->nRefs++; + } + else + { + assert(empty != -1); + item = &c->editor->pFontCache[empty]; + if (item->hFont) + { + TRACE_(richedit_style)( "font deleted %d\n", empty ); + DeleteObject(item->hFont); + item->hFont = NULL; + } + item->hFont = CreateFontIndirectW( &lf ); + TRACE_(richedit_style)( "font created %d\n", empty ); + item->nRefs = 1; + item->lfSpecs = lf; } + s->font_cache = item; + old_font = SelectObject( c->hDC, item->hFont ); + GetTextMetricsW( c->hDC, &s->tm ); + return old_font; } void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont)

1 0

Huw Davies : riched20: Allow the style to remain selected in the context.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 6f1cc1f3b5eadadd8a97a8f15ff82d2a83261f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1cc1f3b5eadadd8a97a8f1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 19 10:55:28 2019 +0100 riched20: Allow the style to remain selected in the context. This avoids swapping out the font if the next run uses the same style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/context.c | 5 ++- dlls/riched20/editor.h | 3 +- dlls/riched20/editstr.h | 2 ++ dlls/riched20/paint.c | 13 ++----- dlls/riched20/para.c | 4 +-- dlls/riched20/run.c | 23 ++++++------ dlls/riched20/style.c | 94 +++++++++++++++++++++++++++---------------------- dlls/riched20/wrap.c | 5 +-- 8 files changed, 75 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f1cc1f3b5eadadd8a97…

1 0

Huw Davies : riched20: Use PatBlt() instead of FillRect() to paint the background area.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: cfeb4358b5382d92f987f81b2e4320b570b5bae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfeb4358b5382d92f987f81b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 19 10:55:29 2019 +0100 riched20: Use PatBlt() instead of FillRect() to paint the background area. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 18 +++++++++++------- dlls/riched20/paint.c | 36 +++++++++++++++++------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b10f719..c4a6902 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4983,42 +4983,46 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { case WM_PAINT: { - HDC hDC; + HDC hdc; RECT rc; PAINTSTRUCT ps; + HBRUSH old_brush; update_caret(editor); - hDC = BeginPaint(editor->hWnd, &ps); + hdc = BeginPaint(editor->hWnd, &ps); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify(editor, EN_UPDATE); + old_brush = SelectObject(hdc, editor->hbrBackground); + /* Erase area outside of the formatting rectangle */ if (ps.rcPaint.top < editor->rcFormat.top) { rc = ps.rcPaint; rc.bottom = editor->rcFormat.top; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.top = editor->rcFormat.top; } if (ps.rcPaint.bottom > editor->rcFormat.bottom) { rc = ps.rcPaint; rc.top = editor->rcFormat.bottom; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.bottom = editor->rcFormat.bottom; } if (ps.rcPaint.left < editor->rcFormat.left) { rc = ps.rcPaint; rc.right = editor->rcFormat.left; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.left = editor->rcFormat.left; } if (ps.rcPaint.right > editor->rcFormat.right) { rc = ps.rcPaint; rc.left = editor->rcFormat.right; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.right = editor->rcFormat.right; } - ME_PaintContent(editor, hDC, &ps.rcPaint); + ME_PaintContent(editor, hdc, &ps.rcPaint); + SelectObject(hdc, old_brush); EndPaint(editor->hWnd, &ps); return 0; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 94fe051..72128072 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -43,6 +43,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); + item = editor->pBuffer->pFirst->next; /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */ @@ -86,7 +87,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) IntersectRect(&rc, &rc, rcUpdate); if (!IsRectEmpty(&rc)) - FillRect(hDC, &rc, c.editor->hbrBackground); + PatBlt(hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } if (editor->nTotalLength != editor->nLastTotalLength || editor->nTotalWidth != editor->nLastTotalWidth) @@ -597,7 +598,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.top = y; bounds->top = ME_twips2pointsY(c, para->fmt.dySpaceBefore); rc.bottom = y + bounds->top + top_border; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } if (para->fmt.dwMask & PFM_SPACEAFTER) @@ -607,7 +608,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.bottom = y + para->nHeight; bounds->bottom = ME_twips2pointsY(c, para->fmt.dySpaceAfter); rc.top = rc.bottom - bounds->bottom - bottom_border; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } /* Native richedit doesn't support paragraph borders in v1.0 - 4.1, @@ -646,7 +647,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.right = rc.left + border_width; rc.top = y + bounds->top; rc.bottom = y + para->nHeight - bounds->bottom; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); MoveToEx(c->hDC, c->pt.x + pen_width + 1, y + bounds->top + DD(4), NULL); LineTo(c->hDC, c->pt.x + pen_width + 1, y + para->nHeight - bounds->bottom - DD(8)); } @@ -661,7 +662,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.right = rc.left + pen_width; rc.top = y + bounds->top; rc.bottom = y + para->nHeight - bounds->bottom; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); MoveToEx(c->hDC, rightEdge - 1 - pen_width - 1, y + bounds->top + DD(4), NULL); LineTo(c->hDC, rightEdge - 1 - pen_width - 1, y + para->nHeight - bounds->bottom - DD(8)); } @@ -725,9 +726,8 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) rc.top = top + width; width = cell->yTextOffset - width; rc.bottom = rc.top + width; - if (width) { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + if (width) + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } /* Draw cell borders. * The order borders are draw in is left, top, bottom, right in order @@ -966,18 +966,18 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.bottom = y + p->member.row.nHeight; } visible = RectVisible(c->hDC, &rc); - if (visible) { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + if (visible) + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); if (bounds.right) { /* If scrolled to the right past the end of the text, then * there may be space to the right of the paragraph border. */ - RECT rcAfterBrdr = rc; - rcAfterBrdr.left = rc.right + bounds.right; - rcAfterBrdr.right = c->rcView.right; - if (RectVisible(c->hDC, &rcAfterBrdr)) - FillRect(c->hDC, &rcAfterBrdr, c->editor->hbrBackground); + RECT after_bdr = rc; + after_bdr.left = rc.right + bounds.right; + after_bdr.right = c->rcView.right; + if (RectVisible(c->hDC, &after_bdr)) + PatBlt(c->hDC, after_bdr.left, after_bdr.top, after_bdr.right - after_bdr.left, + after_bdr.bottom - after_bdr.top, PATCOPY); } if (me_debug) { @@ -1026,9 +1026,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.top = c->pt.y + para->pt.y + para->nHeight; rc.bottom = c->pt.y + p->member.cell.pt.y + p->member.cell.nHeight; if (RectVisible(c->hDC, &rc)) - { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); break; default: break;

1 0