wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Bruno Jesus : dinput: Do not read/ write past the struct for old DX versions.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 327897992b83e77abe30d47eecf6d6b6d78d9cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=327897992b83e77abe30d47ee… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 22 22:06:57 2016 -0300 dinput: Do not read/write past the struct for old DX versions. 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 2f3399d..642dfc0 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -329,9 +329,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( peff->dwSamplePeriod = 0; } - if (dwFlags & DIEP_STARTDELAY) { - peff->dwStartDelay = This->effect.replay.delay * 1000; - } + if ((dwFlags & DIEP_STARTDELAY) && peff->dwSize > sizeof(DIEFFECT_DX5)) + peff->dwStartDelay = This->effect.replay.delay * 1000; if (dwFlags & DIEP_TRIGGERBUTTON) { FIXME("LinuxInput button mapping needs redoing; for now, assuming we're using an actual joystick.\n"); @@ -570,7 +569,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( TRACE("Sample period requested but no sample period functionality present.\n"); if (dwFlags & DIEP_STARTDELAY) - This->effect.replay.delay = peff->dwStartDelay / 1000; + if ((dwFlags & DIEP_STARTDELAY) && peff->dwSize > sizeof(DIEFFECT_DX5)) + This->effect.replay.delay = peff->dwStartDelay / 1000; if (dwFlags & DIEP_TRIGGERBUTTON) { if (peff->dwTriggerButton != -1) {

1 0

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

23 Aug '16

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

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

23 Aug '16

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 23 Aug '16

23 Aug '16

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 : ntdll: Use a helper to allocate threadpool workers.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 3b3c0d9e09c609e9fada24a451f7cb878b2d3f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3c0d9e09c609e9fada24a45… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 22 17:39:10 2016 -0300 ntdll: Use a helper to allocate threadpool workers. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 68 +++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 173e865..6063d51 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1282,6 +1282,28 @@ static void CALLBACK timerqueue_thread_proc( void *param ) } /*********************************************************************** + * tp_new_worker_thread (internal) + * + * Create and account a new worker thread for the desired pool. + */ +static NTSTATUS tp_new_worker_thread( struct threadpool *pool ) +{ + HANDLE thread; + NTSTATUS status; + + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, + threadpool_worker_proc, pool, &thread, NULL ); + if (status == STATUS_SUCCESS) + { + interlocked_inc( &pool->refcount ); + pool->num_workers++; + pool->num_busy_workers++; + NtClose( thread ); + } + return status; +} + +/*********************************************************************** * tp_timerqueue_lock (internal) * * Acquires a lock on the global timerqueue. When the lock is acquired @@ -1713,18 +1735,7 @@ static NTSTATUS tp_threadpool_lock( struct threadpool **out, TP_CALLBACK_ENVIRON /* Make sure that the threadpool has at least one thread. */ if (!pool->num_workers) - { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, pool, &thread, NULL ); - if (status == STATUS_SUCCESS) - { - interlocked_inc( &pool->refcount ); - pool->num_workers++; - pool->num_busy_workers++; - NtClose( thread ); - } - } + status = tp_new_worker_thread( pool ); /* Keep a reference, and increment objcount to ensure that the * last thread doesn't terminate. */ @@ -1910,18 +1921,7 @@ static void tp_object_submit( struct threadpool_object *object, BOOL signaled ) /* Start new worker threads if required. */ if (pool->num_busy_workers >= pool->num_workers && pool->num_workers < pool->max_workers) - { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, pool, &thread, NULL ); - if (status == STATUS_SUCCESS) - { - interlocked_inc( &pool->refcount ); - pool->num_workers++; - pool->num_busy_workers++; - NtClose( thread ); - } - } + status = tp_new_worker_thread( pool ); /* Queue work item and increment refcount. */ interlocked_inc( &object->refcount ); @@ -2406,16 +2406,7 @@ NTSTATUS WINAPI TpCallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) { if (pool->num_workers < pool->max_workers) { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, pool, &thread, NULL ); - if (status == STATUS_SUCCESS) - { - interlocked_inc( &pool->refcount ); - pool->num_workers++; - pool->num_busy_workers++; - NtClose( thread ); - } + status = tp_new_worker_thread( pool ); } else { @@ -2708,16 +2699,9 @@ BOOL WINAPI TpSetPoolMinThreads( TP_POOL *pool, DWORD minimum ) while (this->num_workers < minimum) { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, this, &thread, NULL ); + status = tp_new_worker_thread( this ); if (status != STATUS_SUCCESS) break; - - interlocked_inc( &this->refcount ); - this->num_workers++; - this->num_busy_workers++; - NtClose( thread ); } if (status == STATUS_SUCCESS)

1 0

Frédéric Delanoy : French translation for release 1.9.17
by Jeremy Newman 22 Aug '16

22 Aug '16

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

Keno Fischer : ntdll: Tolerate null handle in DeregisterWait.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 90173ce448e5afe55627c2cbece28fb4f6bae99d URL: http://source.winehq.org/git/wine.git/?a=commit;h=90173ce448e5afe55627c2cbe… Author: Keno Fischer <keno(a)juliacomputing.com> Date: Fri Aug 19 17:24:44 2016 -0400 ntdll: Tolerate null handle in DeregisterWait. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 4 ++++ dlls/ntdll/threadpool.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index a9a04df..0a5f0d3 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1245,6 +1245,10 @@ static void test_RegisterWaitForSingleObject(void) ret = pUnregisterWait(wait_handle); ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + ret = pUnregisterWait(0); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "UnregisterWait failed with unexpected error %d\n", GetLastError()); } static DWORD LS_main; diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 04790aa..173e865 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -637,6 +637,9 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) TRACE( "(%p)\n", WaitHandle ); + if (WaitHandle == NULL) + return STATUS_INVALID_HANDLE; + NtSetEvent( wait_work_item->CancelEvent, NULL ); if (wait_work_item->CallbackInProgress) {

1 0

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

22 Aug '16

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

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

22 Aug '16

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 22 Aug '16

22 Aug '16

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

← Newer
1
...
17
18
19
20
21
22
23
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016