December 2012 - Wine-Commits

Christian Costa : dmloader: COM cleanup of IDirectMusicLoader object.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: b47facb4af09f86c99c6b506024eed392bafc31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47facb4af09f86c99c6b5060… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Dec 18 09:05:39 2012 +0100 dmloader: COM cleanup of IDirectMusicLoader object. --- dlls/dmloader/dmloader_private.h | 14 ++-- dlls/dmloader/loader.c | 182 ++++++++++++++++++++++---------------- 2 files changed, 111 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b47facb4af09f86c99c6b…

1 0

Piotr Caban : msvcrt: Added more setlocale tests.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: 2cb51d9f4a400da72c7601547d7f02b1ea306217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb51d9f4a400da72c7601547… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:39:10 2012 +0100 msvcrt: Added more setlocale tests. --- dlls/msvcrt/tests/locale.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 6b09cdf..fba2462 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -575,6 +575,27 @@ static void test_setlocale(void) ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "English_United States.1252"), "ret = %s\n", ret); + + ret = setlocale(LC_ALL, "English_United States.ACP"); + ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); + if(ret) { + strcpy(buf, "English_United States."); + GetLocaleInfoA(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT), + LOCALE_IDEFAULTANSICODEPAGE, buf+strlen(buf), 80); + ok(!strcmp(ret, buf), "ret = %s, expected %s\n", ret, buf); + } + + ret = setlocale(LC_ALL, "English_United States.OCP"); + ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); + if(ret) { + strcpy(buf, "English_United States."); + GetLocaleInfoA(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT), + LOCALE_IDEFAULTCODEPAGE, buf+strlen(buf), 80); + ok(!strcmp(ret, buf), "ret = %s, expected %s\n", ret, buf); + } + + ret = setlocale(LC_ALL, "English_United States.UTF8"); + ok(ret == NULL, "ret != NULL\n"); } static void test_crtGetStringTypeW(void)

1 0

Hans Leidekker : winhttp: Use the hostname instead of the IPv4 address in the URL returned from WinHttpDetectAutoProxyConfigUrl .
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: 161112326734531004c38a2f17ff4f67207af64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=161112326734531004c38a2f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 18 11:23:20 2012 +0100 winhttp: Use the hostname instead of the IPv4 address in the URL returned from WinHttpDetectAutoProxyConfigUrl. --- dlls/winhttp/session.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8a5c457..c360a7e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1170,18 +1170,34 @@ static void printf_addr( const WCHAR *fmt, WCHAR *buf, struct sockaddr_in *addr (unsigned int)(ntohl( addr->sin_addr.s_addr ) & 0xff) ); } -static WCHAR *build_wpad_url( const struct addrinfo *ai ) +static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len ) { - static const WCHAR fmtW[] = - {'h','t','t','p',':','/','/','%','u','.','%','u','.','%','u','.','%','u', - '/','w','p','a','d','.','d','a','t',0}; - WCHAR *ret; + int ret = -1; +#ifdef HAVE_GETNAMEINFO + ret = getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); +#endif + return ret; +} - while (ai && ai->ai_family != AF_INET) ai = ai->ai_next; +static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) +{ + static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; + static const WCHAR wpadW[] = {'/','w','p','a','d','.','d','a','t',0}; + char name[NI_MAXHOST]; + WCHAR *ret, *p; + int len; + + while (ai && ai->ai_family != AF_INET && ai->ai_family != AF_INET6) ai = ai->ai_next; if (!ai) return NULL; - if (!(ret = GlobalAlloc( 0, sizeof(fmtW) + 12 * sizeof(WCHAR) ))) return NULL; - printf_addr( fmtW, ret, (struct sockaddr_in *)ai->ai_addr ); + if (!reverse_lookup( ai, name, sizeof(name) )) hostname = name; + + len = strlenW( httpW ) + strlen( hostname ) + strlenW( wpadW ); + if (!(ret = p = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) return NULL; + strcpyW( p, httpW ); + p += strlenW( httpW ); + while (*hostname) { *p++ = *hostname++; } + strcpyW( p, wpadW ); return ret; } @@ -1234,7 +1250,7 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) heap_free( name ); if (!res) { - *url = build_wpad_url( ai ); + *url = build_wpad_url( name, ai ); freeaddrinfo( ai ); if (*url) {

1 0

Piotr Caban : msvcrt: Use LC_COLLATE category in strcoll functions.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: 0c91daee8bd7e65f2354b544fb9bc9c3163f638a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c91daee8bd7e65f2354b544f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:56:35 2012 +0100 msvcrt: Use LC_COLLATE category in strcoll functions. --- dlls/msvcrt/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f166865..a254158 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -489,7 +489,7 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t else locinfo = locale->locinfo; - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, -1, str2, -1)-CSTR_EQUAL; + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; } /********************************************************************* @@ -512,7 +512,7 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale else locinfo = locale->locinfo; - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -536,7 +536,7 @@ int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t c else locinfo = locale->locinfo; - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, count, str2, count)-CSTR_EQUAL; + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; } /********************************************************************* @@ -559,7 +559,7 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t else locinfo = locale->locinfo; - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, count, str2, count)-CSTR_EQUAL; }

1 0

Alexandre Julliard : gdi32: Remove from the GetTextExtentExPoint entry points parameters that can' t be handled by the driver.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: bbf3e8621ab2168032979489300122e54751b2c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf3e8621ab21680329794893… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 18 17:52:37 2012 +0100 gdi32: Remove from the GetTextExtentExPoint entry points parameters that can't be handled by the driver. --- dlls/gdi32/driver.c | 6 +--- dlls/gdi32/font.c | 4 +- dlls/gdi32/freetype.c | 62 +++++++++++--------------------------------- dlls/wineps.drv/builtin.c | 26 +++---------------- dlls/wineps.drv/psdrv.h | 3 +- include/wine/gdi_driver.h | 6 ++-- 6 files changed, 28 insertions(+), 79 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f5cadbe..6b68499 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -423,14 +423,12 @@ static UINT nulldrv_GetTextCharsetInfo( PHYSDEV dev, LPFONTSIGNATURE fs, DWORD f return DEFAULT_CHARSET; } -static BOOL nulldrv_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT max_ext, - INT *fit, INT *dx, SIZE *size ) +static BOOL nulldrv_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT *dx ) { return FALSE; } -static BOOL nulldrv_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, INT max_ext, - INT *fit, INT *dx, SIZE *size ) +static BOOL nulldrv_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, INT *dx ) { return FALSE; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3c609a2..3f79dff 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -320,7 +320,7 @@ static BOOL get_char_positions( DC *dc, const WCHAR *str, INT count, INT *dx, SI dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); dev->funcs->pGetTextMetrics( dev, &tm ); - if (!dev->funcs->pGetTextExtentExPoint( dev, str, count, 0, NULL, dx, size )) return FALSE; + if (!dev->funcs->pGetTextExtentExPoint( dev, str, count, dx )) return FALSE; if (dc->breakExtra || dc->breakRem) { @@ -357,7 +357,7 @@ static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count, dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); dev->funcs->pGetTextMetrics( dev, &tm ); - if (!dev->funcs->pGetTextExtentExPointI( dev, indices, count, 0, NULL, dx, size )) return FALSE; + if (!dev->funcs->pGetTextExtentExPointI( dev, indices, count, dx )) return FALSE; if (dc->breakExtra || dc->breakRem) { diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6c39b97..9b6a909 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7134,97 +7134,67 @@ static BOOL freetype_GetCharABCWidthsI( PHYSDEV dev, UINT firstChar, UINT count, /************************************************************* * freetype_GetTextExtentExPoint */ -static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, - INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size) +static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, LPINT dxs ) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; - INT idx; - INT nfit = 0, ext; + INT idx, pos; ABC abc; GLYPHMETRICS gm; - TEXTMETRICW tm; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPoint ); - return dev->funcs->pGetTextExtentExPoint( dev, wstr, count, max_ext, pnfit, dxs, size ); + return dev->funcs->pGetTextExtentExPoint( dev, wstr, count, dxs ); } - TRACE("%p, %s, %d, %d, %p\n", physdev->font, debugstr_wn(wstr, count), count, max_ext, size); + TRACE("%p, %s, %d\n", physdev->font, debugstr_wn(wstr, count), count); GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - size->cx = 0; - get_text_metrics( physdev->font, &tm ); - size->cy = tm.tmHeight; - - for(idx = 0; idx < count; idx++) { + for (idx = pos = 0; idx < count; idx++) + { get_glyph_outline( physdev->font, wstr[idx], GGO_METRICS, &gm, &abc, 0, NULL, &identity ); - size->cx += abc.abcA + abc.abcB + abc.abcC; - ext = size->cx; - if (! pnfit || ext <= max_ext) { - ++nfit; - if (dxs) - dxs[idx] = ext; - } + pos += abc.abcA + abc.abcB + abc.abcC; + dxs[idx] = pos; } - if (pnfit) - *pnfit = nfit; - LeaveCriticalSection( &freetype_cs ); - TRACE("return %d, %d, %d\n", size->cx, size->cy, nfit); return TRUE; } /************************************************************* * freetype_GetTextExtentExPointI */ -static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, - INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size ) +static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, LPINT dxs ) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; - INT idx; - INT nfit = 0, ext; + INT idx, pos; ABC abc; GLYPHMETRICS gm; - TEXTMETRICW tm; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPointI ); - return dev->funcs->pGetTextExtentExPointI( dev, indices, count, max_ext, pnfit, dxs, size ); + return dev->funcs->pGetTextExtentExPointI( dev, indices, count, dxs ); } - TRACE("%p, %p, %d, %d, %p\n", physdev->font, indices, count, max_ext, size); + TRACE("%p, %p, %d\n", physdev->font, indices, count); GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - size->cx = 0; - get_text_metrics(physdev->font, &tm); - size->cy = tm.tmHeight; - - for(idx = 0; idx < count; idx++) { + for (idx = pos = 0; idx < count; idx++) + { get_glyph_outline( physdev->font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, &abc, 0, NULL, &identity ); - size->cx += abc.abcA + abc.abcB + abc.abcC; - ext = size->cx; - if (! pnfit || ext <= max_ext) { - ++nfit; - if (dxs) - dxs[idx] = ext; - } + pos += abc.abcA + abc.abcB + abc.abcC; + dxs[idx] = pos; } - if (pnfit) - *pnfit = nfit; - LeaveCriticalSection( &freetype_cs ); - TRACE("return %d, %d, %d\n", size->cx, size->cy, nfit); return TRUE; } diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 873a473..e2106d3 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -317,43 +317,25 @@ const AFMMETRICS *PSDRV_UVMetrics(LONG UV, const AFM *afm) /*********************************************************************** * PSDRV_GetTextExtentExPoint */ -BOOL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size) +BOOL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - int nfit = 0; int i; float width = 0.0; - float scale; if (physDev->font.fontloc == Download) { dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPoint ); - return dev->funcs->pGetTextExtentExPoint( dev, str, count, maxExt, lpnFit, alpDx, size ); + return dev->funcs->pGetTextExtentExPoint( dev, str, count, alpDx ); } TRACE("%s %i\n", debugstr_wn(str, count), count); - scale = physDev->font.fontinfo.Builtin.scale; - for (i = 0; i < count && str[i] != '\0'; ++i) + for (i = 0; i < count; ++i) { - float scaled_width; width += PSDRV_UVMetrics(str[i], physDev->font.fontinfo.Builtin.afm)->WX; - scaled_width = width * scale; - if (alpDx) - alpDx[i] = scaled_width; - if (scaled_width <= maxExt) - ++nfit; + alpDx[i] = width * physDev->font.fontinfo.Builtin.scale; } - - size->cx = width * physDev->font.fontinfo.Builtin.scale; - size->cy = physDev->font.fontinfo.Builtin.tm.tmHeight; - - if (lpnFit) - *lpnFit = nfit; - - TRACE("cx=%i cy=%i\n", size->cx, size->cy); - return TRUE; } diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index bfc2ad6..428f7ba 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -425,8 +425,7 @@ extern BOOL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; extern BOOL PSDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) DECLSPEC_HIDDEN; -extern BOOL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size) DECLSPEC_HIDDEN; +extern BOOL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) DECLSPEC_HIDDEN; extern BOOL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; extern BOOL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL PSDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index f6be211d..fffbad0 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -116,8 +116,8 @@ struct gdi_dc_funcs COLORREF (*pGetPixel)(PHYSDEV,INT,INT); UINT (*pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY); UINT (*pGetTextCharsetInfo)(PHYSDEV,LPFONTSIGNATURE,DWORD); - BOOL (*pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,INT,LPINT,LPINT,LPSIZE); - BOOL (*pGetTextExtentExPointI)(PHYSDEV,const WORD*,INT,INT,LPINT,LPINT,LPSIZE); + BOOL (*pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,LPINT); + BOOL (*pGetTextExtentExPointI)(PHYSDEV,const WORD*,INT,LPINT); INT (*pGetTextFace)(PHYSDEV,INT,LPWSTR); BOOL (*pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); BOOL (*pGradientFill)(PHYSDEV,TRIVERTEX*,ULONG,void*,ULONG,ULONG); @@ -197,7 +197,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 45 +#define WINE_GDI_DRIVER_VERSION 46 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */

1 0

Alexandre Julliard : gdi32: Add helper functions for GetTextExtentExPoint and fix handling of text justification .
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: 1c2f23cf2f139fc55e6776033f4eed46f0e44d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2f23cf2f139fc55e6776033… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 18 17:41:42 2012 +0100 gdi32: Add helper functions for GetTextExtentExPoint and fix handling of text justification. --- dlls/gdi32/font.c | 237 +++++++++++++++++++++++------------------ dlls/gdi32/tests/font.c | 73 ++++++++++++- dlls/gdiplus/tests/graphics.c | 2 +- 3 files changed, 202 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c2f23cf2f139fc55e677…

1 0

Jörg Höhle : winealsa: Separate read and write pointers.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: 17f098869fec3f051e6c85d8716fb22cb7bc18e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f098869fec3f051e6c85d87… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Mar 8 22:47:37 2012 +0100 winealsa: Separate read and write pointers. --- dlls/winealsa.drv/mmdevdrv.c | 53 ++++++++++++++++++++++++++--------------- 1 files changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e903b9e..3e8ad8d 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -118,6 +118,7 @@ struct ACImpl { UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; snd_pcm_uframes_t remapping_buf_frames; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ + UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ HANDLE timer; @@ -1960,13 +1961,28 @@ static snd_pcm_sframes_t alsa_write_best_effort(snd_pcm_t *handle, BYTE *buf, return written; } +/* The callback and mmdevapi API functions execute concurrently. + * Shared state & life time after Start: + * This constant until _Release + *->pcm_handle likewise + *->fmt likewise + *->alsa_format, hidden_frames likewise + *->local_buffer, bufsize_frames, alsa_bufsize_frames likewise + *->event Read Only, even constant until _Release(!) + *->started Read Only from cb POV, constant if _Stop kills the cb + * + *->held_frames is the only R/W object. + *->lcl_offs_frames/wri_offs_frames are written by one side exclusively: + * lcl_offs_frames by CaptureClient & write callback + * wri_offs_frames by read callback & RenderClient + */ static void alsa_write_data(ACImpl *This) { snd_pcm_sframes_t written, in_alsa; snd_pcm_uframes_t to_write, avail, write_limit, max_period; int err; BYTE *buf = - This->local_buffer + (This->lcl_offs_frames * This->fmt->nBlockAlign); + This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign; /* this call seems to be required to get an accurate snd_pcm_state() */ avail = snd_pcm_avail_update(This->pcm_handle); @@ -2064,14 +2080,16 @@ static void alsa_write_data(ACImpl *This) static void alsa_read_data(ACImpl *This) { - snd_pcm_sframes_t pos, readable, nread; + snd_pcm_sframes_t nread; + UINT32 pos = This->wri_offs_frames, limit = This->held_frames; - pos = (This->held_frames + This->lcl_offs_frames) % This->bufsize_frames; - readable = This->bufsize_frames - pos; + /* FIXME: Detect overrun and signal DATA_DISCONTINUITY + * How to count overrun frames and report them as position increase? */ + limit = This->bufsize_frames - max(limit, pos); nread = snd_pcm_readi(This->pcm_handle, - This->local_buffer + pos * This->fmt->nBlockAlign, readable); - TRACE("read %ld from %u limit %lu\n", nread, This->held_frames + This->lcl_offs_frames, readable); + This->local_buffer + pos * This->fmt->nBlockAlign, limit); + TRACE("read %ld from %u limit %u\n", nread, pos, limit); if(nread < 0){ int ret; @@ -2087,7 +2105,7 @@ static void alsa_read_data(ACImpl *This) } nread = snd_pcm_readi(This->pcm_handle, - This->local_buffer + pos * This->fmt->nBlockAlign, readable); + This->local_buffer + pos * This->fmt->nBlockAlign, limit); if(nread < 0){ WARN("read failed: %ld (%s)\n", nread, snd_strerror(nread)); return; @@ -2103,14 +2121,9 @@ static void alsa_read_data(ACImpl *This) snd_strerror(err)); } + This->wri_offs_frames += nread; + This->wri_offs_frames %= This->bufsize_frames; This->held_frames += nread; - - if(This->held_frames > This->bufsize_frames){ - WARN("Overflow of unread data\n"); - This->lcl_offs_frames += This->held_frames; - This->lcl_offs_frames %= This->bufsize_frames; - This->held_frames = This->bufsize_frames; - } } static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) @@ -2256,6 +2269,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) } This->held_frames = 0; This->lcl_offs_frames = 0; + This->wri_offs_frames = 0; LeaveCriticalSection(&This->lock); @@ -2463,8 +2477,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return AUDCLNT_E_BUFFER_TOO_LARGE; } - write_pos = - (This->lcl_offs_frames + This->held_frames) % This->bufsize_frames; + write_pos = This->wri_offs_frames; if(write_pos + frames > This->bufsize_frames){ if(This->tmp_buffer_frames < frames){ HeapFree(GetProcessHeap(), 0, This->tmp_buffer); @@ -2490,8 +2503,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, static void alsa_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_frames) { - snd_pcm_uframes_t write_offs_frames = - (This->lcl_offs_frames + This->held_frames) % This->bufsize_frames; + snd_pcm_uframes_t write_offs_frames = This->wri_offs_frames; UINT32 write_offs_bytes = write_offs_frames * This->fmt->nBlockAlign; snd_pcm_uframes_t chunk_frames = This->bufsize_frames - write_offs_frames; UINT32 chunk_bytes = chunk_frames * This->fmt->nBlockAlign; @@ -2533,8 +2545,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( } if(This->getbuf_last >= 0) - buffer = This->local_buffer + This->fmt->nBlockAlign * - ((This->lcl_offs_frames + This->held_frames) % This->bufsize_frames); + buffer = This->local_buffer + This->wri_offs_frames * This->fmt->nBlockAlign; else buffer = This->tmp_buffer; @@ -2548,6 +2559,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( if(This->getbuf_last < 0) alsa_wrap_buffer(This, buffer, written_frames); + This->wri_offs_frames += written_frames; + This->wri_offs_frames %= This->bufsize_frames; This->held_frames += written_frames; This->written_frames += written_frames; This->getbuf_last = 0;

1 0

Jörg Höhle : mmdevapi: SetEventHandle is allowed only once.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: b18c5e811f6569c8acb373b529e931dd7505281e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18c5e811f6569c8acb373b52… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Dec 9 21:39:16 2012 +0100 mmdevapi: SetEventHandle is allowed only once. --- dlls/mmdevapi/tests/render.c | 2 +- dlls/winealsa.drv/mmdevdrv.c | 6 ++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++++++ dlls/wineoss.drv/mmdevdrv.c | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9d9478a..e753299 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -634,7 +634,7 @@ static void test_event(void) ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, event); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "SetEventHandle returns %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "SetEventHandle returns %08x\n", hr); r = WaitForSingleObject(event, 40); ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %x\n", r); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 416f1ba..e903b9e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2284,6 +2284,12 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; } + if (This->event){ + LeaveCriticalSection(&This->lock); + FIXME("called twice\n"); + return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); + } + This->event = event; LeaveCriticalSection(&This->lock); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 8ee0dec..ee965e7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1816,6 +1816,12 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; } + if (This->event){ + OSSpinLockUnlock(&This->lock); + FIXME("called twice\n"); + return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); + } + This->event = event; OSSpinLockUnlock(&This->lock); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9fc6f02..4de5ae6 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1620,6 +1620,12 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; } + if (This->event){ + LeaveCriticalSection(&This->lock); + FIXME("called twice\n"); + return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); + } + This->event = event; LeaveCriticalSection(&This->lock);

1 0

Hans Leidekker : winhttp: Check the server response when downloading a PAC script.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: e6ab87ccfa78cffae5bcbe2c1dfc58b5ef7fb2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ab87ccfa78cffae5bcbe2c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 18 11:22:50 2012 +0100 winhttp: Check the server response when downloading a PAC script. --- dlls/winhttp/session.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3889922..8a5c457 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1939,7 +1939,7 @@ static BSTR download_script( const WCHAR *url ) HINTERNET ses, con = NULL, req = NULL; WCHAR *hostname; URL_COMPONENTSW uc; - DWORD size = 4096, offset, to_read, bytes_read, flags = 0; + DWORD status, size = sizeof(status), offset, to_read, bytes_read, flags = 0; char *tmp, *buffer = NULL; BSTR script = NULL; int len; @@ -1956,8 +1956,12 @@ static BSTR download_script( const WCHAR *url ) if (uc.nScheme == INTERNET_SCHEME_HTTPS) flags |= WINHTTP_FLAG_SECURE; if (!(req = WinHttpOpenRequest( con, NULL, uc.lpszUrlPath, NULL, NULL, acceptW, flags ))) goto done; if (!WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 )) goto done; + if (!(WinHttpReceiveResponse( req, 0 ))) goto done; + if (!WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, + &size, NULL ) || status != HTTP_STATUS_OK) goto done; + size = 4096; if (!(buffer = heap_alloc( size ))) goto done; to_read = size; offset = 0;

1 0

Andrew Talbot : msacm32: Indentation fix.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: bb55f47e414ed1f958477e40ffb6003635bb769c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb55f47e414ed1f958477e40f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 17 22:12:11 2012 +0000 msacm32: Indentation fix. --- dlls/msacm32/format.c | 111 ++++++++++++++++++++++++------------------------- 1 files changed, 54 insertions(+), 57 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 963daf7..f7f0fa4 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -894,12 +894,12 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, ACMFORMATTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum) { - PWINE_ACMDRIVERID padid; - unsigned int i; - BOOL bPcmDone = FALSE; + PWINE_ACMDRIVERID padid; + unsigned int i; + BOOL bPcmDone = FALSE; TRACE("(%p, %p, %p, %ld, %d)\n", - had, paftd, fnCallback, dwInstance, fdwEnum); + had, paftd, fnCallback, dwInstance, fdwEnum); if (!paftd) return MMSYSERR_INVALPARAM; @@ -920,63 +920,60 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, /* if (had) FIXME("had != NULL, not supported\n"); */ if (had) { + if (acmDriverID((HACMOBJ)had, (HACMDRIVERID *)&padid, 0) != MMSYSERR_NOERROR) + return MMSYSERR_INVALHANDLE; - if (acmDriverID((HACMOBJ)had, (HACMDRIVERID *)&padid, 0) != MMSYSERR_NOERROR) - return MMSYSERR_INVALHANDLE; - - for (i = 0; i < padid->cFormatTags; i++) { - paftd->dwFormatTagIndex = i; - if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, - (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { - if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { - if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); - /* (WS) I'm preserving this PCM hack since it seems to be - * correct. Please notice this block was borrowed from - * below. - */ - if (bPcmDone) continue; - bPcmDone = TRUE; - } - if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) - return MMSYSERR_NOERROR; - } - } - + for (i = 0; i < padid->cFormatTags; i++) { + paftd->dwFormatTagIndex = i; + if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, + (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { + if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { + if (paftd->szFormatTag[0] == 0) + MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + /* (WS) I'm preserving this PCM hack since it seems to be + * correct. Please notice this block was borrowed from + * below. + */ + if (bPcmDone) continue; + bPcmDone = TRUE; + } + if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) + return MMSYSERR_NOERROR; + } + } } - /* if had==0 then search for the first suitable driver */ else { - for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) { - /* should check for codec only */ - if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) && - acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == MMSYSERR_NOERROR) { - for (i = 0; i < padid->cFormatTags; i++) { - paftd->dwFormatTagIndex = i; - if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, - (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { - if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { - if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); - /* FIXME (EPP): I'm not sure this is the correct - * algorithm (should make more sense to apply the same - * for all already loaded formats, but this will do - * for now - */ - if (bPcmDone) continue; - bPcmDone = TRUE; - } - if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) { - acmDriverClose(had, 0); - return MMSYSERR_NOERROR; - } - } - } - acmDriverClose(had, 0); - } - } + for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) { + /* should check for codec only */ + if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) && + acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == MMSYSERR_NOERROR) { + for (i = 0; i < padid->cFormatTags; i++) { + paftd->dwFormatTagIndex = i; + if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, + (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { + if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { + if (paftd->szFormatTag[0] == 0) + MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + /* FIXME (EPP): I'm not sure this is the correct + * algorithm (should make more sense to apply the same + * for all already loaded formats, but this will do + * for now + */ + if (bPcmDone) continue; + bPcmDone = TRUE; + } + if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) { + acmDriverClose(had, 0); + return MMSYSERR_NOERROR; + } + } + } + acmDriverClose(had, 0); + } + } } return MMSYSERR_NOERROR; }

1 0