wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Alexandre Julliard : Make the regression SHA1 a URL in the bug edit form.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: bugzilla Branch: master Commit: 1bfdb2639676f750aa34f14a09da598b9113a913 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=1bfdb2639676f750aa34f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 12:25:32 2011 +0200 Make the regression SHA1 a URL in the bug edit form. --- template/en/default/bug/edit.html.tmpl | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 2638d04..ced2646 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -907,9 +907,16 @@ [% FOREACH field = Bugzilla.active_custom_fields %] <tr> + [% IF field.name == 'cf_regression_sha1sum' && bug.${field.name} %] [% PROCESS bug/field.html.tmpl value=bug.${field.name} + desc_url="http://source.winehq.org/git/wine.git/commit/${bug.cf_regression_sha1sum}" editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] + [% ELSE %] + [% PROCESS bug/field.html.tmpl value=bug.${field.name} + editable = bug.check_can_change_field(field.name, 0, 1) + value_span = 2 %] + [% END %] </tr> [% END %] [% END %]

1 0

Alexandre Julliard : Switch searches to 1.4 milestone, and add SHA1 in regression search.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: bugzilla Branch: master Commit: 09bbbd2802a3cc738f9c6eea144ecf8f95adfaae URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=09bbbd2802a3cc738f9c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 11:27:16 2011 +0200 Switch searches to 1.4 milestone, and add SHA1 in regression search. --- template/en/default/global/sidebar.html.tmpl | 4 ++-- template/en/default/index.html.tmpl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index e52cd05..941c0db 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,8 +23,8 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.2.0&order=bugs.bug_severity">Wine 1.2</a></li> - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&keywords_type=anywords">Regressions</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.4.0&order=bugs.bug_severity">Wine 1.4</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 4b95e55..350e223 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -187,15 +187,15 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Wine 1.2</a> - These bugs are scheduled to be fixed before Wine 1.2 is released. + <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NE…">Wine 1.4</a> + These bugs are scheduled to be fixed before Wine 1.4 is released. </li> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Regressions</a> + <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NE…">Regressions</a> Bugs introduced as result of a regression. </li> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">With download</a> + <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NE…">With download</a> Bugs in downloadable Applications. </li>

1 0

Alistair Leslie-Hughes : mshtml: Fix test for Windows 7 with IE9.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 05e18862cb5ae825697695a6ac9b6d4772a9a863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e18862cb5ae825697695a6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 22 20:09:59 2011 +1000 mshtml: Fix test for Windows 7 with IE9. --- dlls/mshtml/tests/dom.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4a2a7ac..45b3a80 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4459,7 +4459,8 @@ static void test_window(IHTMLDocument2 *doc) str = NULL; hres = IHTMLWindow2_toString(window, &str); ok(hres == S_OK, "toString failed: %08x\n", hres); - ok(!strcmp_wa(str, "[object]"), "toString returned %s\n", wine_dbgstr_w(str)); + ok(!strcmp_wa(str, "[object]") || + !strcmp_wa(str, "[object Window]") /* win7 ie9 */, "toString returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); test_window_name(window, NULL);

1 0

Jörg Höhle : mmdevapi: Unlock buffer in case of ReleaseBuffer error.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 83796800959794b98bb1dfd4090bbf3a04627605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83796800959794b98bb1dfd40… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Sep 12 07:12:10 2011 +0200 mmdevapi: Unlock buffer in case of ReleaseBuffer error. --- dlls/winealsa.drv/mmdevdrv.c | 3 ++- dlls/wineoss.drv/mmdevdrv.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 15146f5..8118103 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2097,8 +2097,9 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( written = alsa_write_best_effort(This->pcm_handle, buffer, written_frames, This); if(written < 0){ + This->buf_state = NOT_LOCKED; LeaveCriticalSection(&This->lock); - WARN("write failed: %ld (%s)\n", written, snd_strerror(written)); + ERR("write failed: %ld (%s)\n", written, snd_strerror(written)); return E_FAIL; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 33438e4..b7e3bbf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1731,8 +1731,9 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( written_frames * This->fmt->nBlockAlign); if(w_bytes < 0){ if(errno != EAGAIN){ + This->buf_state = NOT_LOCKED; LeaveCriticalSection(&This->lock); - WARN("write failed: %d (%s)\n", errno, strerror(errno)); + ERR("write failed: %d (%s)\n", errno, strerror(errno)); return E_FAIL; }else /* OSS buffer full */ w_bytes = 0;

1 0

Jörg Höhle : wineoss: EAGAIN (OSS buffer full) is a regular situation.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 55efce6c9ca7fd13f4e4362f7fc8fd456d803ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55efce6c9ca7fd13f4e4362f7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 21 10:42:16 2011 +0200 wineoss: EAGAIN (OSS buffer full) is a regular situation. --- dlls/wineoss.drv/mmdevdrv.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 562a674..33438e4 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1224,6 +1224,7 @@ static void oss_write_data(ACImpl *This) written = write(This->fd, buf, to_write * This->fmt->nBlockAlign); if(written < 0){ + /* EAGAIN is OSS buffer full, log that too */ WARN("write failed: %d (%s)\n", errno, strerror(errno)); return; } @@ -1729,9 +1730,12 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( w_bytes = write(This->fd, buffer, written_frames * This->fmt->nBlockAlign); if(w_bytes < 0){ - LeaveCriticalSection(&This->lock); - WARN("write failed: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; + if(errno != EAGAIN){ + LeaveCriticalSection(&This->lock); + WARN("write failed: %d (%s)\n", errno, strerror(errno)); + return E_FAIL; + }else /* OSS buffer full */ + w_bytes = 0; } w_frames = w_bytes / This->fmt->nBlockAlign; This->inbuf_frames += w_frames;

1 0

Jörg Höhle : mmdevapi: Fix stuttering upon start and underrun.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 03ad9366f1ada4fbda6adeb44cc64b0e61413d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ad9366f1ada4fbda6adeb44… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Sep 20 15:03:52 2011 +0200 mmdevapi: Fix stuttering upon start and underrun. --- dlls/winealsa.drv/mmdevdrv.c | 3 ++- dlls/wineoss.drv/mmdevdrv.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c77b54e..15146f5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2107,7 +2107,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( alsa_wrap_buffer(This, This->tmp_buffer + written * This->fmt->nBlockAlign, written_frames - written); - + else + This->lcl_offs_frames += written; This->held_frames = written_frames - written; } } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 629f4f7..562a674 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1740,7 +1740,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( if(This->buf_state == LOCKED_WRAPPED) oss_wrap_buffer(This, This->tmp_buffer + w_bytes, written_frames - w_frames); - + else + This->lcl_offs_frames += w_frames; This->held_frames = written_frames - w_frames; } }

1 0

Francois Gouget : user32: Change HotTrackingColor to better differentiate regular links from visited links .
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: dd0f5377edb618a791be6082cb28b609923abe0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0f5377edb618a791be6082c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 22 16:56:42 2011 +0200 user32: Change HotTrackingColor to better differentiate regular links from visited links. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6c5955a..fe910f2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -124,7 +124,7 @@ static const struct {"InfoText", RGB(0, 0, 0)}, /* COLOR_INFOTEXT */ {"InfoWindow", RGB(255, 255, 225)}, /* COLOR_INFOBK */ {"ButtonAlternateFace", RGB(181, 181, 181)}, /* COLOR_ALTERNATEBTNFACE */ - {"HotTrackingColor", RGB(0, 0, 128)}, /* COLOR_HOTLIGHT */ + {"HotTrackingColor", RGB(0, 0, 200)}, /* COLOR_HOTLIGHT */ {"GradientActiveTitle", RGB(166, 202, 240)}, /* COLOR_GRADIENTACTIVECAPTION */ {"GradientInactiveTitle", RGB(192, 192, 192)}, /* COLOR_GRADIENTINACTIVECAPTION */ {"MenuHilight", RGB(10, 36, 106)}, /* COLOR_MENUHILIGHT */

1 0

Francois Gouget : comctl32: Not visited links use HotTrackingColor for the text.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 701415f045883dd772f31568fbbc982e9b9728f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701415f045883dd772f31568f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 22 16:53:31 2011 +0200 comctl32: Not visited links use HotTrackingColor for the text. --- dlls/comctl32/syslink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index c13267e..01d638c 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1752,7 +1752,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->HasFocus = FALSE; infoPtr->MouseDownID = -1; infoPtr->TextColor = comctl32_color.clrWindowText; - infoPtr->LinkColor = comctl32_color.clrHighlight; + infoPtr->LinkColor = comctl32_color.clrHotTrackingColor; infoPtr->VisitedColor = comctl32_color.clrHighlight; infoPtr->BackColor = infoPtr->Style & LWS_TRANSPARENT ? comctl32_color.clrWindow : comctl32_color.clrBtnFace;

1 0

Michael Stefaniuc : winmm: Remove casts to the type of the casted expression.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: f83c470805b9b7bbc7ce628adef7df93416d12e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83c470805b9b7bbc7ce628ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 22 16:24:21 2011 +0200 winmm: Remove casts to the type of the casted expression. --- dlls/winmm/waveform.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 820d228..1152f61 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -625,7 +625,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_OpenInfo *info, WORD channels, if(mr != MMSYSERR_NOERROR) return WAVERR_BADFORMAT; - device = WINMM_GetDeviceFromHWAVE((HWAVE)info->handle); + device = WINMM_GetDeviceFromHWAVE(info->handle); if(!device) return MMSYSERR_INVALHANDLE; @@ -917,7 +917,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, device->cb_info.flags = HIWORD(info->flags & CALLBACK_TYPEMASK); device->cb_info.callback = info->callback; device->cb_info.user = info->cb_user; - device->cb_info.hwave = (HWAVE)device->handle; + device->cb_info.hwave = device->handle; info->handle = device->handle; @@ -1645,7 +1645,7 @@ static HRESULT WINMM_BeginPlaying(WINMM_Device *device) static LRESULT WINMM_Pause(HWAVE hwave) { - WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); + WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); HRESULT hr; TRACE("(%p)\n", hwave); @@ -1670,7 +1670,7 @@ static LRESULT WINMM_Pause(HWAVE hwave) static LRESULT WINMM_Reset(HWAVE hwave) { WINMM_CBInfo cb_info; - WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); + WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); WAVEHDR *first; MMRESULT mr; @@ -1752,7 +1752,7 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time) { - WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); + WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); UINT32 played_frames, sample_rate, bytes_per_frame; TRACE("(%p, %p)\n", hwave, time); @@ -2823,8 +2823,7 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, return WINMM_QueryInstanceIDSize(HandleToULong(hWaveOut), (DWORD_PTR*)dwParam1, TRUE); case DRV_QUERYFUNCTIONINSTANCEID: - return WINMM_QueryInstanceID(HandleToULong(hWaveOut), - (WCHAR*)dwParam1, (DWORD_PTR)dwParam2, TRUE); + return WINMM_QueryInstanceID(HandleToULong(hWaveOut), (WCHAR*)dwParam1, dwParam2, TRUE); /* TODO: Remove after dsound has been rewritten for mmdevapi */ case DRV_QUERYDSOUNDDESC: case DRV_QUERYDSOUNDIFACE: @@ -3203,8 +3202,7 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, return WINMM_QueryInstanceIDSize(HandleToULong(hWaveIn), (DWORD_PTR*)dwParam1, FALSE); case DRV_QUERYFUNCTIONINSTANCEID: - return WINMM_QueryInstanceID(HandleToULong(hWaveIn), - (WCHAR*)dwParam1, (DWORD_PTR)dwParam2, FALSE); + return WINMM_QueryInstanceID(HandleToULong(hWaveIn), (WCHAR*)dwParam1, dwParam2, FALSE); /* TODO: Remove after dsound has been rewritten for mmdevapi */ case DRV_QUERYDSOUNDDESC: case DRV_QUERYDSOUNDIFACE:

1 0

Francois Gouget : comctl32: Add some SysLink style and state definitions.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 552677956752ea0a136b8d1eb162550d09f964ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=552677956752ea0a136b8d1eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 22 16:50:22 2011 +0200 comctl32: Add some SysLink style and state definitions. --- include/commctrl.h | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index e19b861..0139488 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5098,6 +5098,10 @@ static const WCHAR WC_LINK[] = { 'S','y','s','L','i','n','k',0 }; /* SysLink styles */ #define LWS_TRANSPARENT 0x0001 #define LWS_IGNORERETURN 0x0002 +#define LWS_NOPREFIX 0x0004 +#define LWS_USEVISUALSTYLE 0x0008 +#define LWS_USECUSTOMTEXT 0x0010 +#define LWS_RIGHT 0x0020 /* SysLink messages */ #define LM_HITTEST (WM_USER + 768) @@ -5115,9 +5119,11 @@ static const WCHAR WC_LINK[] = { 'S','y','s','L','i','n','k',0 }; /* SysLink links states */ -#define LIS_FOCUSED 1 -#define LIS_ENABLED 2 -#define LIS_VISITED 4 +#define LIS_FOCUSED 0x0001 +#define LIS_ENABLED 0x0002 +#define LIS_VISITED 0x0004 +#define LIS_HOTTRACK 0x0008 +#define LIS_DEFAULTCOLORS 0x0010 /* SysLink misc. */

1 0

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 September 2011