September 2011 - Wine-Commits

Alexandre Julliard : Make the regression SHA1 a URL in the bug edit form.
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

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 : Make the regression SHA1 a URL in bug lists.
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

Module: bugzilla Branch: master Commit: 7570aa2efdc918d1ef822596834a4e2ab2599942 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=7570aa2efdc918d1ef822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 12:25:38 2011 +0200 Make the regression SHA1 a URL in bug lists. --- template/en/default/list/table.html.tmpl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index d23d4c6..331f402 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -208,6 +208,9 @@ [% bug.${login_column}.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %] + [% ELSIF column == 'cf_regression_sha1sum' && bug.cf_regression_sha1sum %] + <a href="http://source.winehq.org/git/wine.git/commit/[% bug.cf_regression_sha1sum FILTER html %]"> + [% bug.cf_regression_sha1sum.truncate(16) FILTER html %]</a> [% ELSE %] [%- display_value(column, bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] [% END %]

1 0

Nikolay Sivov : comctl32/monthcal: Enable multiple calendars support.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 23dfef0d9ecda65a01992a7ac9dfbe9df67b93bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=23dfef0d9ecda65a01992a7ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 22 17:56:40 2011 +0400 comctl32/monthcal: Enable multiple calendars support. --- dlls/comctl32/monthcal.c | 108 ++++++++++++++++++++++++++-------------- dlls/comctl32/tests/monthcal.c | 22 +++----- 2 files changed, 78 insertions(+), 52 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 762a792..5f8a36c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -71,6 +71,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal); #define MC_PREVNEXTMONTHTIMER 1 /* Timer IDs */ #define MC_TODAYUPDATETIMER 2 +#define MC_CALENDAR_PADDING 6 + #define countof(arr) (sizeof(arr)/sizeof(arr[0])) /* convert from days to 100 nanoseconds unit - used as FILETIME unit */ @@ -2392,7 +2394,6 @@ MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr) static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) { static const WCHAR O0W[] = { '0','0',0 }; - HDC hdc = GetDC(infoPtr->hwndSelf); RECT *title=&infoPtr->calendars[0].title; RECT *prev=&infoPtr->titlebtnprev; RECT *next=&infoPtr->titlebtnnext; @@ -2402,16 +2403,19 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) RECT *weeknumrect=&infoPtr->calendars[0].weeknums; RECT *days=&infoPtr->calendars[0].days; RECT *todayrect=&infoPtr->todayrect; - SIZE size, sz; + + INT xdiv, dx, dy, i, j, x, y, c_dx, c_dy; + WCHAR buff[80]; TEXTMETRICW tm; - HFONT currentFont; - INT xdiv, dx, dy, i; + SIZE size, sz; RECT client; - WCHAR buff[80]; + HFONT font; + HDC hdc; GetClientRect(infoPtr->hwndSelf, &client); - currentFont = SelectObject(hdc, infoPtr->hFont); + hdc = GetDC(infoPtr->hwndSelf); + font = SelectObject(hdc, infoPtr->hFont); /* get the height and width of each day's text */ GetTextMetricsW(hdc, &tm); @@ -2441,6 +2445,10 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) /* recalculate the height and width increments and offsets */ GetTextExtentPoint32W(hdc, O0W, 2, &size); + /* restore the originally selected font */ + SelectObject(hdc, font); + ReleaseDC(infoPtr->hwndSelf, hdc); + xdiv = (infoPtr->dwStyle & MCS_WEEKNUMBERS) ? 8 : 7; infoPtr->width_increment = size.cx * 2 + 4; @@ -2461,21 +2469,17 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) next->right = title->right - 4; next->left = next->right - (title->bottom - title->top); - /* titlemonth->left and right change based upon the current month */ - /* and are recalculated in refresh as the current month may change */ - /* without the control being resized */ + /* titlemonth->left and right change based upon the current month + and are recalculated in refresh as the current month may change + without the control being resized */ titlemonth->top = titleyear->top = title->top + (infoPtr->height_increment)/2; titlemonth->bottom = titleyear->bottom = title->bottom - (infoPtr->height_increment)/2; - /* setup the dimensions of the rectangle we draw the names of the */ - /* days of the week in */ - weeknumrect->left = 0; - - if(infoPtr->dwStyle & MCS_WEEKNUMBERS) - weeknumrect->right = prev->right; - else - weeknumrect->right = weeknumrect->left; + /* week numbers */ + weeknumrect->left = 0; + weeknumrect->right = infoPtr->dwStyle & MCS_WEEKNUMBERS ? prev->right : 0; + /* days abbreviated names */ wdays->left = days->left = weeknumrect->right; wdays->right = days->right = wdays->left + 7 * infoPtr->width_increment; wdays->top = title->bottom; @@ -2489,29 +2493,62 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) todayrect->top = days->bottom; todayrect->bottom = days->bottom + infoPtr->height_increment; + /* compute calendar count, update all calendars */ + x = (client.right + MC_CALENDAR_PADDING) / (title->right - title->left + MC_CALENDAR_PADDING); + /* today label affects whole height */ + if (infoPtr->dwStyle & MCS_NOTODAY) + y = (client.bottom + MC_CALENDAR_PADDING) / (days->bottom - title->top + MC_CALENDAR_PADDING); + else + y = (client.bottom - todayrect->bottom + todayrect->top + MC_CALENDAR_PADDING) / + (days->bottom - title->top + MC_CALENDAR_PADDING); + + /* TODO: ensure that count is properly adjusted to fit 12 months constraint */ + if (x == 0) x = 1; + if (y == 0) y = 1; + + infoPtr->dim.cx = x; + infoPtr->dim.cy = y; + infoPtr->calendars = ReAlloc(infoPtr->calendars, MONTHCAL_GetCalCount(infoPtr) * sizeof(CALENDAR_INFO)); + + for (i = 1; i < MONTHCAL_GetCalCount(infoPtr); i++) + { + /* set months */ + infoPtr->calendars[i] = infoPtr->calendars[0]; + MONTHCAL_GetMonth(&infoPtr->calendars[i].month, i); + } + /* offset all rectangles to center in client area */ - dx = (client.right - title->right) / 2; - dy = (client.bottom - todayrect->bottom) / 2; + c_dx = (client.right - x * title->right - MC_CALENDAR_PADDING * (x-1)) / 2; + c_dy = (client.bottom - y * todayrect->bottom - MC_CALENDAR_PADDING * (y-1)) / 2; /* if calendar doesn't fit client area show it at left/top bounds */ - if (title->left + dx < 0) dx = 0; - if (title->top + dy < 0) dy = 0; + if (title->left + c_dx < 0) c_dx = 0; + if (title->top + c_dy < 0) c_dy = 0; - if (dx != 0 || dy != 0) + for (i = 0; i < y; i++) { - OffsetRect(title, dx, dy); - OffsetRect(prev, dx, dy); - OffsetRect(next, dx, dy); - OffsetRect(titlemonth, dx, dy); - OffsetRect(titleyear, dx, dy); - OffsetRect(wdays, dx, dy); - OffsetRect(weeknumrect, dx, dy); - OffsetRect(days, dx, dy); - OffsetRect(todayrect, dx, dy); + for (j = 0; j < x; j++) + { + dx = j*(title->right - title->left + MC_CALENDAR_PADDING) + c_dx; + dy = i*(days->bottom - title->top + MC_CALENDAR_PADDING) + c_dy; + + OffsetRect(&infoPtr->calendars[i*x+j].title, dx, dy); + OffsetRect(&infoPtr->calendars[i*x+j].titlemonth, dx, dy); + OffsetRect(&infoPtr->calendars[i*x+j].titleyear, dx, dy); + OffsetRect(&infoPtr->calendars[i*x+j].wdays, dx, dy); + OffsetRect(&infoPtr->calendars[i*x+j].weeknums, dx, dy); + OffsetRect(&infoPtr->calendars[i*x+j].days, dx, dy); + } } - /* TODO: update calendars count */ - infoPtr->dim.cx = infoPtr->dim.cy = 1; + OffsetRect(prev, c_dx, c_dy); + OffsetRect(next, (x-1)*(title->right - title->left + MC_CALENDAR_PADDING) + c_dx, c_dy); + + i = infoPtr->dim.cx * infoPtr->dim.cy - infoPtr->dim.cx; + todayrect->left = infoPtr->calendars[i].title.left; + todayrect->right = infoPtr->calendars[i].title.right; + todayrect->top = infoPtr->calendars[i].days.bottom; + todayrect->bottom = infoPtr->calendars[i].days.bottom + infoPtr->height_increment; TRACE("dx=%d dy=%d client[%s] title[%s] wdays[%s] days[%s] today[%s]\n", infoPtr->width_increment,infoPtr->height_increment, @@ -2520,11 +2557,6 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) wine_dbgstr_rect(wdays), wine_dbgstr_rect(days), wine_dbgstr_rect(todayrect)); - - /* restore the originally selected font */ - SelectObject(hdc, currentFont); - - ReleaseDC(infoPtr->hwndSelf, hdc); } static LRESULT MONTHCAL_Size(MONTHCAL_INFO *infoPtr, int Width, int Height) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 87aadec..ccf8881 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1316,18 +1316,15 @@ static void test_monthrange(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible); - todo_wine { - expect(2, res); - } + expect(2, res); + expect(2000, st_visible[0].wYear); expect(11, st_visible[0].wMonth); expect(1, st_visible[0].wDay); expect(2000, st_visible[1].wYear); + expect(12, st_visible[1].wMonth); + expect(31, st_visible[1].wDay); - todo_wine { - expect(12, st_visible[1].wMonth); - expect(31, st_visible[1].wDay); - } res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_DAYSTATE, (LPARAM)st_daystate); todo_wine { expect(4, res); @@ -1335,12 +1332,9 @@ static void test_monthrange(void) expect(2000, st_daystate[0].wYear); expect(10, st_daystate[0].wMonth); expect(29, st_daystate[0].wDay); - - todo_wine { - expect(2001, st_daystate[1].wYear); - expect(1, st_daystate[1].wMonth); - expect(6, st_daystate[1].wDay); - } + expect(2001, st_daystate[1].wYear); + expect(1, st_daystate[1].wMonth); + expect(6, st_daystate[1].wDay); ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_monthrange_seq, "monthcal monthrange", FALSE); @@ -1814,7 +1808,7 @@ static void test_MCM_GETCALENDARCOUNT(void) return; } - todo_wine expect(2, ret); + expect(2, ret); DestroyWindow(hwnd); }

1 0

Michael Stefaniuc : gdi32/tests: Remove casts to the type of the casted expression.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: a68cbe98d4ca0990c04691c35e21a7c1c6c387a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68cbe98d4ca0990c04691c35… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 22 15:58:54 2011 +0200 gdi32/tests: Remove casts to the type of the casted expression. --- dlls/gdi32/tests/bitmap.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 89d2c9c..78c79c0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -879,7 +879,7 @@ static void test_dib_formats(void) bi->bmiHeader.biSizeImage = 0; memset( bi->bmiColors, 0xaa, sizeof(RGBQUAD) * 256 ); - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); if (expect_ok && (planes == 1 || planes * bpp <= 16)) ok( hdib != NULL, "CreateDIBSection failed for %u/%u/%u\n", bpp, planes, compr ); else @@ -1006,7 +1006,7 @@ static void test_dib_formats(void) *(DWORD *)&bi->bmiColors[1] = 0; *(DWORD *)&bi->bmiColors[2] = 0; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); ok( !ret, "SetDIBits succeeded with null bitfields\n" ); @@ -1034,7 +1034,7 @@ static void test_dib_formats(void) *(DWORD *)&bi->bmiColors[0] = 3; *(DWORD *)&bi->bmiColors[1] = 0; *(DWORD *)&bi->bmiColors[2] = 7; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); ok( !ret, "SetDIBits succeeded with null bitfields\n" ); @@ -1043,7 +1043,7 @@ static void test_dib_formats(void) *(DWORD *)&bi->bmiColors[0] = 0x55; *(DWORD *)&bi->bmiColors[1] = 0x44; *(DWORD *)&bi->bmiColors[2] = 0x33; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib != NULL, "CreateDIBSection failed with bad bitfields\n" ); if (hdib) DeleteObject( hdib ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); @@ -1053,7 +1053,7 @@ static void test_dib_formats(void) bi->bmiHeader.biHeight = 2; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with negative width\n" ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib == NULL, "CreateDIBitmap succeeded with negative width\n" ); @@ -1076,7 +1076,7 @@ static void test_dib_formats(void) bi->bmiHeader.biHeight = 2; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with zero width\n" ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib != NULL, "CreateDIBitmap failed with zero width\n" ); @@ -1100,7 +1100,7 @@ static void test_dib_formats(void) bi->bmiHeader.biHeight = 0; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with zero height\n" ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib != NULL, "CreateDIBitmap failed with zero height\n" );

1 0

Francois Gouget : winmm/tests: Make it clear that no msrle. avi file is needed for the standard tests.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 5619b2154b90d34219ef881b2e4f4600fb8a80a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5619b2154b90d34219ef881b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 22 12:37:34 2011 +0200 winmm/tests: Make it clear that no msrle.avi file is needed for the standard tests. --- dlls/winmm/tests/mmio.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e175083..ea8faed 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -74,7 +74,7 @@ static void test_mmioDescend(char *fname) hmmio = mmioOpen(fname, &mmio, MMIO_READ); if (fname && !hmmio) { - skip("%s file is missing, skipping the test\n", fname); + trace("No optional %s file. Skipping the test\n", fname); return; } ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); @@ -241,7 +241,7 @@ static void test_mmioOpen(char *fname) hmmio = mmioOpen(fname, &mmio, MMIO_READ); if (fname && !hmmio) { - skip("%s file is missing, skipping the test\n", fname); + trace("No optional %s file. Skipping the test\n", fname); return; } ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); @@ -494,7 +494,7 @@ static void test_mmioSetBuffer(char *fname) hmmio = mmioOpen(fname, &mmio, MMIO_READ); if (fname && !hmmio) { - skip("%s file is missing, skipping the test\n", fname); + trace("No optional %s file. Skipping the test\n", fname); return; } ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); @@ -671,6 +671,10 @@ static void test_mmioOpen_fourcc(void) START_TEST(mmio) { + /* Make it possible to run the tests against a specific AVI file in + * addition to the builtin test data. This is mostly meant as a + * debugging aid and is not part of the standard tests. + */ char fname[] = "msrle.avi"; test_mmioDescend(NULL);

1 0

Juan Lang : crypt32: Fix memory leak in failure cases.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: be0d294485b38e40f5f270c143d18d48c8c3dbe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0d294485b38e40f5f270c14… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 22 05:23:21 2011 -0700 crypt32: Fix memory leak in failure cases. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/crl.c | 2 +- dlls/crypt32/ctl.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 0117f27..63107e1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -160,7 +160,7 @@ PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, data = CryptMemAlloc(cbCertEncoded); if (!data) { - CryptMemFree(cert); + CertFreeCertificateContext(cert); cert = NULL; goto end; } diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index cafe564..5b5a455 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -58,7 +58,7 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, data = CryptMemAlloc(cbCrlEncoded); if (!data) { - CryptMemFree(crl); + CertFreeCRLContext(crl); crl = NULL; goto end; } diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 09ebf26..9a8f176 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -447,7 +447,7 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, end: if (!ret) { - CryptMemFree(ctl); + CertFreeCTLContext(ctl); ctl = NULL; LocalFree(ctlInfo); CryptMemFree(content);

1 0

Michael Stefaniuc : winmm: Remove casts to the type of the casted expression.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

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: Not visited links use HotTrackingColor for the text.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

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

Jörg Höhle : mmdevapi: Fix stuttering upon start and underrun.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

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

Jörg Höhle : mmdevapi: Unlock buffer in case of ReleaseBuffer error.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

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