August 2016 - Wine-Commits - list.winehq.org

Jacek Caban : wpc: Added basic tests.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

Module: wine Branch: master Commit: 72824494e24844e371b7a2e0178935ab3f47ef13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72824494e24844e371b7a2e01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 22 16:52:41 2016 +0200 wpc: Added basic tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wpc/tests/Makefile.in | 4 ++++ dlls/wpc/tests/wpc.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ include/wpcapi.idl | 8 ++++++++ 5 files changed, 63 insertions(+) diff --git a/configure b/configure index f4c9f19..12879c3 100755 --- a/configure +++ b/configure @@ -18177,6 +18177,7 @@ wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib wine_fn_config_dll wpc enable_wpc +wine_fn_config_test dlls/wpc/tests wpc_test wine_fn_config_dll wpcap enable_wpcap wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test diff --git a/configure.ac b/configure.ac index 2fcdcb1..60fc4f8 100644 --- a/configure.ac +++ b/configure.ac @@ -3406,6 +3406,7 @@ WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) WINE_CONFIG_DLL(wpc) +WINE_CONFIG_TEST(dlls/wpc/tests) WINE_CONFIG_DLL(wpcap) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) diff --git a/dlls/wpc/tests/Makefile.in b/dlls/wpc/tests/Makefile.in new file mode 100644 index 0000000..72f550d --- /dev/null +++ b/dlls/wpc/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = wpc.dll +IMPORTS = ole32 + +C_SRCS = wpc.c diff --git a/dlls/wpc/tests/wpc.c b/dlls/wpc/tests/wpc.c new file mode 100644 index 0000000..4d3da36 --- /dev/null +++ b/dlls/wpc/tests/wpc.c @@ -0,0 +1,49 @@ +/* + * Copyright 2016 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include "initguid.h" +#include "wpcapi.h" + +#include "wine/test.h" + +static void test_wpc(void) +{ + IWindowsParentalControls *wpc; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_WindowsParentalControls, NULL, CLSCTX_INPROC_SERVER, &IID_IWindowsParentalControls, (void**)&wpc); + if(hres == REGDB_E_CLASSNOTREG) + todo_wine win_skip("CLSID_WindowsParentalControls not registered\n"); + else + ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); + if(FAILED(hres)) + return; + + IWindowsParentalControls_Release(wpc); +} + +START_TEST(wpc) +{ + CoInitialize(NULL); + + test_wpc(); + + CoUninitialize(); +} diff --git a/include/wpcapi.idl b/include/wpcapi.idl index db2d991..097c290 100644 --- a/include/wpcapi.idl +++ b/include/wpcapi.idl @@ -114,3 +114,11 @@ interface IWindowsParentalControls : IWindowsParentalControlsCore [in] LPCWSTR pcszSID, [out] IWPCGamesSettings **ppSettings) ; } + +[ + uuid(e77cc89b-7401-4c04-8ced-149db35add04) +] +coclass WindowsParentalControls +{ + [default] interface IWindowsParentalControls; +}

1 0

Jacek Caban : wpc: Added stub wpc dll.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

Module: wine Branch: master Commit: 668e69a7678f5d148ef4e42d27f7e9b0cfd84b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668e69a7678f5d148ef4e42d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 22 16:52:27 2016 +0200 wpc: Added stub wpc dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wpc/Makefile.in | 4 ++++ dlls/wpc/wpc.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wpc/wpc.spec | 3 +++ 5 files changed, 69 insertions(+) diff --git a/configure b/configure index 3eba2d2..f4c9f19 100755 --- a/configure +++ b/configure @@ -1404,6 +1404,7 @@ enable_wmiutils enable_wmp enable_wmvcore enable_wnaspi32 +enable_wpc enable_wpcap enable_ws2_32 enable_wshom_ocx @@ -18175,6 +18176,7 @@ wine_fn_config_test dlls/wmp/tests wmp_test wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib +wine_fn_config_dll wpc enable_wpc wine_fn_config_dll wpcap enable_wpcap wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test diff --git a/configure.ac b/configure.ac index 24e5190..2fcdcb1 100644 --- a/configure.ac +++ b/configure.ac @@ -3405,6 +3405,7 @@ WINE_CONFIG_TEST(dlls/wmp/tests) WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) +WINE_CONFIG_DLL(wpc) WINE_CONFIG_DLL(wpcap) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) diff --git a/dlls/wpc/Makefile.in b/dlls/wpc/Makefile.in new file mode 100644 index 0000000..edd729f --- /dev/null +++ b/dlls/wpc/Makefile.in @@ -0,0 +1,4 @@ +MODULE = wpc.dll + +C_SRCS = \ + wpc.c diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c new file mode 100644 index 0000000..a3e7c03 --- /dev/null +++ b/dlls/wpc/wpc.c @@ -0,0 +1,59 @@ +/* + * Copyright 2016 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wpcapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wpc); + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (wpc.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + FIXME("Unknown object %s (iface %s)\n", debugstr_guid(rclsid), debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (wpc.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + TRACE("\n"); + return S_FALSE; +} diff --git a/dlls/wpc/wpc.spec b/dlls/wpc/wpc.spec new file mode 100644 index 0000000..195cf86 --- /dev/null +++ b/dlls/wpc/wpc.spec @@ -0,0 +1,3 @@ +@ stub ApplyParentalControlsW +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

Bruno Jesus : dinput: Dump the force feedback effect before upload.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

Module: wine Branch: master Commit: c7e6b4fbec93274f5f362fff0ea11cbdd7d3fd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e6b4fbec93274f5f362fff0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 22 22:06:55 2016 -0300 dinput: Dump the force feedback effect before upload. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 87 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index dc12aa6..9215265 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -72,6 +72,92 @@ static double ff_effect_direction_to_rad(unsigned int dir) return (dir & 0xffff) * M_PI / 0x8000; } +static void ff_dump_effect(struct ff_effect *effect) +{ + const char *type = "(Unknown)", *length = "INFINITE"; + struct ff_envelope *env = NULL; + double angle; +#define FE(x) case x: type = #x; break + switch (effect->type) + { + FE(FF_RUMBLE); + FE(FF_PERIODIC); + FE(FF_CONSTANT); + FE(FF_SPRING); + FE(FF_FRICTION); + FE(FF_DAMPER); + FE(FF_INERTIA); + FE(FF_RAMP); + } +#undef FE + + /* rotate so 0 points right */ + angle = 360 - ff_effect_direction_to_rad(effect->direction + 0xc000) * 180 / M_PI; + + if (effect->replay.length) + length = wine_dbg_sprintf("%u ms", effect->replay.length); + + TRACE("type: 0x%x %s, id %d, direction 0x%x (angle: %.2f), time length %s, start delay %u ms\n", + effect->type, type, effect->id, effect->direction, angle, length, effect->replay.delay); + if (effect->trigger.button || effect->trigger.interval) + TRACE("trigger button %u, re-trigger interval %u ms\n", + effect->trigger.button, effect->trigger.interval); + + if (effect->type == FF_PERIODIC) + { + struct ff_periodic_effect *per = &effect->u.periodic; + const char *wave = "(Unknown)"; +#define FE(x) case x: wave = #x; break + switch (per->waveform) + { + FE(FF_SQUARE); + FE(FF_TRIANGLE); + FE(FF_SINE); + FE(FF_SAW_UP); + FE(FF_SAW_DOWN); + FE(FF_CUSTOM); + } +#undef FE + TRACE(" -> waveform 0x%x %s, period %u, magnitude %d, offset %d, phase %u, custom len %d\n", + per->waveform, wave, per->period, per->magnitude, per->offset, per->phase, per->custom_len); + env = &per->envelope; + } + else if (effect->type == FF_CONSTANT) + { + struct ff_constant_effect *cons = &effect->u.constant; + TRACE(" -> level %d\n", cons->level); + env = &cons->envelope; + } + else if (effect->type == FF_RAMP) + { + struct ff_ramp_effect *ramp = &effect->u.ramp; + TRACE(" -> start/end level %d/%d\n", ramp->start_level, ramp->end_level); + env = &ramp->envelope; + } + else if (effect->type == FF_RUMBLE) + { + struct ff_rumble_effect *rumble = &effect->u.rumble; + TRACE(" -> strong/weak magnitude %d/%d\n", rumble->strong_magnitude, rumble->weak_magnitude); + } + else if (effect->type == FF_SPRING || effect->type == FF_FRICTION || + effect->type == FF_DAMPER || effect->type == FF_INERTIA) + { + struct ff_condition_effect *cond = effect->u.condition; + int i; + for (i = 0; i < 2; i++) + { + /* format numbers here to make them align correctly */ + TRACE(" -> [%d] right/left saturation %5u/%5u, right/left coefficient %5d/%5d," + " deadband %5u, center %5d\n", i, cond[i].right_saturation, cond[i].left_saturation, + cond[i].right_coeff, cond[i].left_coeff, cond[i].deadband, cond[i].center); + } + } + + if (env) + TRACE(" -> envelope attack length/level %u/%u, fade length/level %u/%u\n", + env->attack_length, env->attack_level, env->fade_length, env->fade_level); +} + /****************************************************************************** * LinuxInputEffectImpl */ @@ -89,6 +175,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Download( LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p)\n", This); + ff_dump_effect(&This->effect); if (ioctl(*(This->fd), EVIOCSFF, &This->effect) == -1) { if (errno == ENOMEM) {

1 0

Nikolay Sivov : dinput: Explicitly check for -1 as open() failure code.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

Module: wine Branch: master Commit: 3605cde8eaf9388d0321a250d0d85bd0d8708381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3605cde8eaf9388d0321a250d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 23 00:22:15 2016 +0300 dinput: Explicitly check for -1 as open() failure code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3086e68..1f8f94d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -150,8 +150,7 @@ static BOOL read_sys_id_variable(int index, const char *property, WORD *value) BOOL ret = FALSE; sprintf(sys_path, SYS_PATH_FORMAT, index, property); - sys_fd = open(sys_path, O_RDONLY); - if (sys_fd > 0) + if ((sys_fd = open(sys_path, O_RDONLY)) != -1) { if (read(sys_fd, id_str, 4) == 4) { @@ -180,10 +179,10 @@ static INT find_joystick_devices(void) BYTE axes_map[ABS_MAX + 1]; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); - if ((fd = open(joydev.device, O_RDONLY)) < 0) + if ((fd = open(joydev.device, O_RDONLY)) == -1) { snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_OLD, i); - if ((fd = open(joydev.device, O_RDONLY)) < 0) continue; + if ((fd = open(joydev.device, O_RDONLY)) == -1) continue; } strcpy(joydev.name, "Wine Joystick"); @@ -355,7 +354,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ - if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) + if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1) { WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); return S_FALSE; @@ -384,7 +383,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ - if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) + if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1) { WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); return S_FALSE;

1 0

Bruno Jesus : dinput: Be more precise when returning effect upload errors.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

Module: wine Branch: master Commit: 844a25ab38ffd89359308d3ce19ac225fb1d9340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=844a25ab38ffd89359308d3ce… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 22 22:06:56 2016 -0300 dinput: Be more precise when returning effect upload errors. Based on ideas by Elias Vanderstuyft. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 9215265..2f3399d 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -173,20 +173,32 @@ static HRESULT WINAPI LinuxInputEffectImpl_Download( LPDIRECTINPUTEFFECT iface) { LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); + int ret; TRACE("(this=%p)\n", This); ff_dump_effect(&This->effect); - if (ioctl(*(This->fd), EVIOCSFF, &This->effect) == -1) { - if (errno == ENOMEM) { - return DIERR_DEVICEFULL; - } else { - FIXME("Could not upload effect. Assuming a disconnected device %d \"%s\".\n", *This->fd, strerror(errno)); - return DIERR_INPUTLOST; - } - } + if (ioctl(*(This->fd), EVIOCSFF, &This->effect) != -1) + return DI_OK; - return DI_OK; + switch (errno) + { + case EINVAL: + ret = DIERR_INVALIDPARAM; + break; + case ENOSPC: + ret = DIERR_DEVICEFULL; + break; + case ENOMEM: + ret = DIERR_OUTOFMEMORY; + break; + default: + ret = DIERR_INPUTLOST; + break; + } + TRACE("Could not upload effect to fd %d, errno %d \"%s\", returning 0x%x.\n", + *This->fd, errno, strerror(errno), ret); + return ret; } static HRESULT WINAPI LinuxInputEffectImpl_Escape(

1 0

Frédéric Delanoy : French translation for release 1.9.17
by Jeremy Newman Aug. 22, 2016

Aug. 22, 2016

Module: website Branch: master Commit: 723e946a8c7508cf1e77be29422bd59adc408d98 URL: http://source.winehq.org/git/website.git/?a=commit;h=723e946a8c7508cf1e77be… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 22 10:42:32 2016 +0200 French translation for release 1.9.17 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016081901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2016081901.xml b/news/fr/2016081901.xml new file mode 100644 index 0000000..6d7b820 --- /dev/null +++ b/news/fr/2016081901.xml @@ -0,0 +1,16 @@ +<news> +<date>19 août 2016</date> +<title>Sortie de Wine 1.9.17</title> +<body> +La version de développement 1.9.17 de Wine est disponible. +<a href="{$root}/announce/1.9.17">Nouveautés</a> de cette version : +<ul> + <li>Meilleur traitement des exceptions en mode 64 bits.</li> + <li>Diverses améliorations dans la prise en charge des joysticks.</li> + <li>Prise en charge additionnelle des flux dans le moteur d'exécution C++.</li> + <li>Améliorations dans l'incorporation de polices de caractères.</li> + <li>Prise en charge améliorée des métafichiers dans GDI+.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.17.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Nikolay Sivov : comctl32/treeview: Fill full row for TVS_FULLROWSELECT style.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 382dc1ded8e13bb5d15d6d18e238b66f0997dffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=382dc1ded8e13bb5d15d6d18e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 22 12:50:14 2016 +0300 comctl32/treeview: Fill full row for TVS_FULLROWSELECT style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 55e22e2..117b309 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -31,7 +31,7 @@ * missing notifications: TVN_GETINFOTIP, TVN_KEYDOWN, * TVN_SETDISPINFO * - * missing styles: TVS_FULLROWSELECT, TVS_INFOTIP, TVS_RTLREADING, + * missing styles: TVS_INFOTIP, TVS_RTLREADING, * * missing item styles: TVIS_EXPANDPARTIAL, TVIS_EX_FLAT, * TVIS_EX_DISABLED @@ -2577,6 +2577,13 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) if (cditem & CDRF_NEWFONT) TREEVIEW_ComputeTextWidth(infoPtr, item, hdc); + if (TREEVIEW_IsFullRowSelect(infoPtr)) + { + HBRUSH brush = CreateSolidBrush(nmcdhdr.clrTextBk); + FillRect(hdc, &item->rect, brush); + DeleteObject(brush); + } + TREEVIEW_DrawItemLines(infoPtr, hdc, item); /* Set colors. Custom draw handler can change these so we do this after it. */

1 0

Huw Davies : user32: Scale the button size with screen resolution.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 9efcbd113d37e84edd802640187b23bd8f126fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efcbd113d37e84edd8026401… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 22 08:58:31 2016 +0100 user32: Scale the button size with screen resolution. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index b8a1cee..166b1a4 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -143,10 +143,6 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = OB_Paint /* BS_OWNERDRAW */ }; -static HBITMAP hbitmapCheckBoxes = 0; -static WORD checkBoxWidth = 0, checkBoxHeight = 0; - - /********************************************************************* * button class descriptor */ @@ -243,14 +239,6 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, break; case WM_CREATE: - if (!hbitmapCheckBoxes) - { - BITMAP bmp; - hbitmapCheckBoxes = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CHECKBOXES)); - GetObjectW( hbitmapCheckBoxes, sizeof(bmp), &bmp ); - checkBoxWidth = bmp.bmWidth / 4; - checkBoxHeight = bmp.bmHeight / 3; - } if (btn_type >= MAX_BTN_TYPE) return -1; /* abort */ @@ -851,7 +839,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) { RECT rbox, rtext, client; HBRUSH hBrush; - int delta, text_offset; + int delta, text_offset, checkBoxWidth, checkBoxHeight; UINT dtFlags; HFONT hFont; LONG state = get_button_state( hwnd ); @@ -868,6 +856,9 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) GetClientRect(hwnd, &client); rbox = rtext = client; + checkBoxWidth = 12 * GetDeviceCaps( hDC, LOGPIXELSX ) / 96 + 1; + checkBoxHeight = 12 * GetDeviceCaps( hDC, LOGPIXELSY ) / 96 + 1; + if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont ); GetCharWidthW( hDC, '0', '0', &text_offset ); text_offset /= 2;

1 0

Marcus Meissner : winemenubuilder: Avoid double free (Coverity).
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 2e32c0c6572a0da72164196715781940c38aa352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e32c0c6572a0da7216419671… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Aug 21 20:38:18 2016 +0200 winemenubuilder: Avoid double free (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 2b7340f..e0c6ba2 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1005,13 +1005,8 @@ static HRESULT write_native_icon(IStream *iconStream, ICONDIRENTRY *pIconDirEntr position.QuadPart = 0; hr = IStream_Seek(iconStream, position, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - goto end; - hr = convert_to_native_icon(iconStream, &nIndex, 1, &CLSID_WICPngEncoder, icon_name, szFileName); - -end: - HeapFree(GetProcessHeap(), 0, pIconDirEntry); - return hr; + if (FAILED(hr)) return hr; + return convert_to_native_icon(iconStream, &nIndex, 1, &CLSID_WICPngEncoder, icon_name, szFileName); } static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra)

1 0

Nikolay Sivov : include: Added some of newer Common Controls definitions.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 710a58da79a81a708042db81fdfecdd917c76b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710a58da79a81a708042db81f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 22 12:50:50 2016 +0300 include: Added some of newer Common Controls definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 132 ++++++++++++++++++++++++++++++++++++++++++++-------- include/commctrl.rh | 3 ++ 2 files changed, 116 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=710a58da79a81a708042d…

1 0