November 2011 - Wine-Commits

Jörg Höhle : mmdevapi/tests: Prevent crash when device is in use.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 7480dc0af1f032c3939d1fa3adc46d5eaf5bbbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7480dc0af1f032c3939d1fa3a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 8 19:40:59 2011 +0100 mmdevapi/tests: Prevent crash when device is in use. --- dlls/mmdevapi/tests/capture.c | 8 ++++++++ dlls/mmdevapi/tests/render.c | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index ed88020..eed56dd 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -330,6 +330,8 @@ static void test_streamvolume(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, fmt, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + if(hr != S_OK) + return; hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -430,6 +432,8 @@ static void test_channelvolume(void) hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&acv); ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr != S_OK) + return; hr = IChannelAudioVolume_GetChannelCount(acv, NULL); ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); @@ -530,6 +534,8 @@ static void test_simplevolume(void) hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr != S_OK) + return; hr = ISimpleAudioVolume_GetMasterVolume(sav, NULL); ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08x\n", hr); @@ -621,6 +627,8 @@ static void test_volume_dependence(void) hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08x\n", hr); + if(hr != S_OK) + return; hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 0.2f); ok(hr == S_OK, "ASV_SetChannelVolume failed: %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index d55f2ae..7108815 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -530,6 +530,8 @@ static void test_padding(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + if(hr != S_OK) + return; hr = IAudioClient_GetDevicePeriod(ac, &defp, &minp); ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); @@ -1396,6 +1398,8 @@ static void test_session_creation(void) NULL, (void**)&ac); ok((hr == S_OK)^(ac == NULL), "Activate %08x &out pointer\n", hr); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; hr = IAudioClient_GetMixFormat(ac, &fmt); ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr);

1 0

Marcus Meissner : oleaut32: Use correct variable (Coverity).
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 49cade4b01cb6089e7e53355f968a0d70633e4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49cade4b01cb6089e7e53355f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 14 17:23:14 2011 +0100 oleaut32: Use correct variable (Coverity). --- dlls/oleaut32/tests/vartype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 1ceb436..dd32f8a 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5152,7 +5152,7 @@ static void test_VarBstrCmp(void) SysFreeString(bstr); bstr = SysAllocStringByteLen(sbchr0, sizeof(sbchr0)); - bstr2 = SysAllocStringByteLen(sbchr0, sizeof(sbchr00)); + bstr2 = SysAllocStringByteLen(sbchr00, sizeof(sbchr00)); VARBSTRCMP(bstr,bstrempty,0,VARCMP_GT); VARBSTRCMP(bstrempty,bstr,0,VARCMP_LT); VARBSTRCMP(bstr2,bstrempty,0,VARCMP_GT); @@ -5171,7 +5171,7 @@ static void test_VarBstrCmp(void) SysFreeString(bstr); bstr = SysAllocStringByteLen(sbchr0, sizeof(sbchr0)); - bstr2 = SysAllocStringByteLen(sbchr0, sizeof(sbchr00)); + bstr2 = SysAllocStringByteLen(sbchr00, sizeof(sbchr00)); VARBSTRCMP(bstr,bstrempty,0,VARCMP_GT); VARBSTRCMP(bstrempty,bstr,0,VARCMP_LT); VARBSTRCMP(bstr2,bstrempty,0,VARCMP_GT);

1 0

Jacek Caban : urlmon: Fixed misc. c tests on IE9 and make image_tiff_filter behave like IE9.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 75dd4123117e4e8ecfea5ade87a56b5c9de2d33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75dd4123117e4e8ecfea5ade8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 14 17:07:02 2011 +0100 urlmon: Fixed misc.c tests on IE9 and make image_tiff_filter behave like IE9. --- dlls/urlmon/tests/misc.c | 17 ++++++++++++----- dlls/urlmon/urlmon_main.c | 5 ++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index cc69c72..c45428c 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -515,7 +515,7 @@ static BYTE data35[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'x','x','x','x',0}; static BYTE data36[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,'x','x'}; static BYTE data37[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'<','h','t','m','l','>'}; static BYTE data38[] = {0x00,0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'x'}; -static BYTE data39[] = {0x4d,0x4d,0x00,0x2a}; +static BYTE data39[] = {0x4d,0x4d,0x00,0x2a,0xff}; static BYTE data40[] = {0x4d,0x4d,0x00,0x2a,'<','h','t','m','l','>',0}; static BYTE data41[] = {0x4d,0x4d,0xff}; static BYTE data42[] = {0x4d,0x4d}; @@ -562,11 +562,12 @@ static BYTE data82[] = {'.','s','n','d',0}; static BYTE data83[] = {'.','s','n','d'}; static BYTE data84[] = {'.','s','n','d',0,'<','h','t','m','l','>',1,1}; static BYTE data85[] = {'.','S','N','D',0}; +static BYTE data86[] = {0x49,0x49,0x2a,0xff}; static const struct { BYTE *data; DWORD size; - LPCWSTR mime, mime_alt; + LPCWSTR mime, mime_alt, broken_mime; } mime_tests2[] = { {data1, sizeof(data1), mimeTextPlain}, {data2, sizeof(data2), mimeAppOctetStream}, @@ -608,7 +609,7 @@ static const struct { {data38, sizeof(data38), mimeAppOctetStream}, {data39, sizeof(data39), mimeImageTiff}, {data40, sizeof(data40), mimeTextHtml, mimeImageTiff /* IE8 */}, - {data41, sizeof(data41), mimeImageTiff}, + {data41, sizeof(data41), mimeTextPlain, NULL, mimeImageTiff}, {data42, sizeof(data42), mimeTextPlain}, {data43, sizeof(data43), mimeAppOctetStream}, {data44, sizeof(data44), mimeVideoAvi}, @@ -652,13 +653,15 @@ static const struct { {data82, sizeof(data82), mimeAudioBasic}, {data83, sizeof(data83), mimeTextPlain}, {data84, sizeof(data84), mimeTextHtml, mimeAudioBasic /* IE8 */}, - {data85, sizeof(data85), mimeTextPlain} + {data85, sizeof(data85), mimeTextPlain}, + {data86, sizeof(data86), mimeImageTiff, NULL, mimeTextPlain} }; static void test_FindMimeFromData(void) { HRESULT hres; LPWSTR mime; + BYTE b; int i; for(i=0; i<sizeof(mime_tests)/sizeof(mime_tests[0]); i++) { @@ -692,8 +695,12 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, NULL, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + b = !lstrcmpW(mime, mime_tests2[i].mime); + ok(b || broken(mime_tests2[i].broken_mime && !lstrcmpW(mime, mime_tests2[i].broken_mime)), + "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); + if(!b) + continue; hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, mimeTextHtml, 0, &mime, 0); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 4d60977..0911127 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -602,7 +602,10 @@ static BOOL image_pjpeg_filter(const BYTE *b, DWORD size) static BOOL image_tiff_filter(const BYTE *b, DWORD size) { - return size > 2 && b[0] == 0x4d && b[1] == 0x4d; + static const BYTE magic1[] = {0x4d,0x4d,0x00,0x2a}; + static const BYTE magic2[] = {0x49,0x49,0x2a,0xff}; + + return size >= 4 && (!memcmp(b, magic1, 4) || !memcmp(b, magic2, 4)); } static BOOL image_xpng_filter(const BYTE *b, DWORD size)

1 0

Francois Gouget : mcicda: Give a name to the critical sections.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 4db0d0da197b7241c71a99a13bc767c7fe7a86eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db0d0da197b7241c71a99a13… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 15:11:10 2011 +0100 mcicda: Give a name to the critical sections. --- dlls/mcicda/mcicda.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 3ec8307..1ea9a58 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -179,6 +179,7 @@ static DWORD MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; modp->wType = MCI_DEVTYPE_CD_AUDIO; InitializeCriticalSection(&wmcda->cs); + wmcda->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCICDAUDIO.cs"); return modp->wDeviceID; } @@ -190,6 +191,7 @@ static DWORD MCICDA_drvClose(DWORD dwDevID) WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(dwDevID); if (wmcda) { + wmcda->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&wmcda->cs); HeapFree(GetProcessHeap(), 0, wmcda); mciSetDriverData(dwDevID, 0);

1 0

Huw Davies : gdi32: Add support for drawing text in the dib driver.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: e9612c1af06d09dbf03745535288575e05cacb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9612c1af06d09dbf03745535… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 14 12:49:07 2011 +0000 gdi32: Add support for drawing text in the dib driver. --- dlls/gdi32/dibdrv/graphics.c | 170 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 167 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 343dd0d..be78e1a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -122,14 +122,141 @@ static inline void get_text_bkgnd_masks( const dibdrv_physdev *pdev, rop_mask *m } } +static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHMETRICS *metrics, + const struct gdi_image_bits *image ) +{ + const WINEREGION *clip = get_wine_region( pdev->clip ); + int i; + RECT rect, clipped_rect; + POINT src_origin; + static dib_info glyph_dib; + + glyph_dib.bit_count = 8; + glyph_dib.width = metrics->gmBlackBoxX; + glyph_dib.height = metrics->gmBlackBoxY; + glyph_dib.stride = get_dib_stride( metrics->gmBlackBoxX, 8 ); + glyph_dib.bits = *image; + + rect.left = origin->x + metrics->gmptGlyphOrigin.x; + rect.top = origin->y - metrics->gmptGlyphOrigin.y; + rect.right = rect.left + metrics->gmBlackBoxX; + rect.bottom = rect.top + metrics->gmBlackBoxY; + + for (i = 0; i < clip->numRects; i++) + { + if (intersect_rect( &clipped_rect, &rect, clip->rects + i )) + { + src_origin.x = clipped_rect.left - rect.left; + src_origin.y = clipped_rect.top - rect.top; + + pdev->dib.funcs->draw_glyph( &pdev->dib, &clipped_rect, &glyph_dib, &src_origin, + pdev->text_color, pdev->glyph_intensities ); + } + } + + release_wine_region( pdev->clip ); +} + +static inline UINT get_aa_flags( dibdrv_physdev *pdev ) +{ + LOGFONTW lf; + + if (pdev->dib.bit_count <= 8) return GGO_BITMAP; + + GetObjectW( GetCurrentObject( pdev->dev.hdc, OBJ_FONT ), sizeof(lf), &lf ); + if (lf.lfQuality == NONANTIALIASED_QUALITY) return GGO_BITMAP; + + /* FIXME, check gasp and user prefs */ + return GGO_GRAY4_BITMAP; +} + +static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; +static const int padding[4] = {0, 3, 2, 1}; + +/*********************************************************************** + * get_glyph_bitmap + * + * Retrieve a 17-level bitmap for the appropiate glyph. + * + * For non-antialiased bitmaps convert them to the 17-level format + * using only values 0 or 16. + */ +static DWORD get_glyph_bitmap( dibdrv_physdev *pdev, UINT index, GLYPHMETRICS *metrics, + struct gdi_image_bits *image ) +{ + UINT aa_flags = get_aa_flags( pdev ), ggo_flags = aa_flags | GGO_GLYPH_INDEX; + static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; + UINT indices[3] = {0, 0, 0x20}; + int i, x, y; + DWORD ret, size; + BYTE *buf, *dst, *src; + int pad, stride; + + image->ptr = NULL; + image->is_copy = FALSE; + image->free = free_heap_bits; + image->param = NULL; + + indices[0] = index; + + for (i = 0; i < sizeof(indices) / sizeof(indices[0]); index = indices[++i]) + { + ret = GetGlyphOutlineW( pdev->dev.hdc, index, ggo_flags, metrics, 0, NULL, &identity ); + if (ret != GDI_ERROR) break; + } + + if (ret == GDI_ERROR) return ERROR_NOT_FOUND; + if (!ret) return ERROR_SUCCESS; /* empty glyph */ + + /* We'll convert non-antialiased 1-bpp bitmaps to 8-bpp, so these sizes relate to 8-bpp */ + pad = padding[ metrics->gmBlackBoxX % 4 ]; + stride = get_dib_stride( metrics->gmBlackBoxX, 8 ); + size = metrics->gmBlackBoxY * stride; + + buf = HeapAlloc( GetProcessHeap(), 0, size ); + if (!buf) return ERROR_OUTOFMEMORY; + + ret = GetGlyphOutlineW( pdev->dev.hdc, index, ggo_flags, metrics, size, buf, &identity ); + if (ret == GDI_ERROR) + { + HeapFree( GetProcessHeap(), 0, buf ); + return ERROR_NOT_FOUND; + } + + if (aa_flags == GGO_BITMAP) + { + for (y = metrics->gmBlackBoxY - 1; y >= 0; y--) + { + src = buf + y * get_dib_stride( metrics->gmBlackBoxX, 1 ); + dst = buf + y * stride; + + if (pad) memset( dst + metrics->gmBlackBoxX, 0, pad ); + + for (x = metrics->gmBlackBoxX - 1; x >= 0; x--) + dst[x] = (src[x / 8] & masks[x % 8]) ? 0x10 : 0; + } + } + else if (pad) + { + for (y = 0, dst = buf; y < metrics->gmBlackBoxY; y++, dst += stride) + memset( dst + metrics->gmBlackBoxX, 0, pad ); + } + + image->ptr = buf; + return ERROR_SUCCESS; +} + /*********************************************************************** * dibdrv_ExtTextOut */ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExtTextOut ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + UINT i; + POINT origin; + DWORD err; + HRGN saved_clip = NULL; if (flags & ETO_OPAQUE) { @@ -140,8 +267,45 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, if (count == 0) return TRUE; - flags &= ~ETO_OPAQUE; - return next->funcs->pExtTextOut( next, x, y, flags, rect, str, count, dx ); + if (flags & ETO_CLIPPED) + { + HRGN clip = CreateRectRgnIndirect( rect ); + saved_clip = add_extra_clipping_region( pdev, clip ); + DeleteObject( clip ); + } + + origin.x = x; + origin.y = y; + for (i = 0; i < count; i++) + { + GLYPHMETRICS metrics; + struct gdi_image_bits image; + + err = get_glyph_bitmap( pdev, (UINT)str[i], &metrics, &image ); + if (err) continue; + + if (image.ptr) draw_glyph( pdev, &origin, &metrics, &image ); + if (image.free) image.free( &image ); + + if (dx) + { + if (flags & ETO_PDY) + { + origin.x += dx[ i * 2 ]; + origin.y += dx[ i * 2 + 1]; + } + else + origin.x += dx[ i ]; + } + else + { + origin.x += metrics.gmCellIncX; + origin.y += metrics.gmCellIncY; + } + } + + restore_clipping_region( pdev, saved_clip ); + return TRUE; } /***********************************************************************

1 0

Francois Gouget : include: Update dlgs.h.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: b295da2d865c40046598a8208c28d0f36c742905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b295da2d865c40046598a8208… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 14 11:30:51 2011 +0100 include: Update dlgs.h. --- include/dlgs.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/dlgs.h b/include/dlgs.h index 7315b11..abcb488 100644 --- a/include/dlgs.h +++ b/include/dlgs.h @@ -210,5 +210,15 @@ #define COLORMGMTDLGORD 1551 #define NEWFILEOPENV2ORD 1552 #define NEWFILEOPENV3ORD 1553 +#define NEWFORMATDLGWITHLINK 1591 +#define IDC_MANAGE_LINK 1592 + +typedef struct tagCRGB +{ + BYTE bRed; + BYTE bGreen; + BYTE bBlue; + BYTE bExtra; +} CRGB; #endif /* #ifdef __WINE_DLGS_H */

1 0

Marcus Meissner : urlmon: Fixed an array overread (Coverity).
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 6a629710ce02012defed1cfa30f8c3c91298ab99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a629710ce02012defed1cfa3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 14 12:31:11 2011 +0100 urlmon: Fixed an array overread (Coverity). --- dlls/urlmon/tests/sec_mgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2f33f02..2509d84 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -423,8 +423,8 @@ static void test_SecurityManager(void) ok(size == sizeof(secid10) || size == sizeof(secid10_2), /* win2k3 */ "size=%d\n", size); - ok(!memcmp(buf, secid10, size) || - !memcmp(buf, secid10_2, size), /* win2k3 */ + ok(!memcmp(buf, secid10, sizeof(secid10)) || + !memcmp(buf, secid10_2, sizeof(secid10_2)), /* win2k3 */ "wrong secid\n"); zone = 100;

1 0

Juan Lang : iphlpapi: Combine #ifdef HAVE_IFADDRS_H blocks.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: cd0ee464cdd4b719e3245d33d5a7bd87dd948e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0ee464cdd4b719e3245d33d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 13 08:25:52 2011 -0800 iphlpapi: Combine #ifdef HAVE_IFADDRS_H blocks. --- dlls/iphlpapi/ifenum.c | 130 +++++++++++++++++++++++------------------------ 1 files changed, 64 insertions(+), 66 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index d84caed..7e0caf2 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -764,6 +764,69 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) return ret; } +ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) +{ + struct ifaddrs *ifa; + ULONG ret; + + if (!getifaddrs(&ifa)) + { + struct ifaddrs *p; + ULONG n; + char name[IFNAMSIZ]; + + getInterfaceNameByIndex(index, name); + for (p = ifa, n = 0; p; p = p->ifa_next) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && + !strcmp(name, p->ifa_name)) + n++; + if (n) + { + *addrs = HeapAlloc(GetProcessHeap(), 0, n * (sizeof(SOCKET_ADDRESS) + + sizeof(struct WS_sockaddr_in6))); + if (*addrs) + { + struct WS_sockaddr_in6 *next_addr = (struct WS_sockaddr_in6 *)( + (BYTE *)*addrs + n * sizeof(SOCKET_ADDRESS)); + + for (p = ifa, n = 0; p; p = p->ifa_next) + { + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && + !strcmp(name, p->ifa_name)) + { + struct sockaddr_in6 *addr = (struct sockaddr_in6 *)p->ifa_addr; + + next_addr->sin6_family = WS_AF_INET6; + next_addr->sin6_port = addr->sin6_port; + next_addr->sin6_flowinfo = addr->sin6_flowinfo; + memcpy(&next_addr->sin6_addr, &addr->sin6_addr, + sizeof(next_addr->sin6_addr)); + next_addr->sin6_scope_id = addr->sin6_scope_id; + (*addrs)[n].lpSockaddr = (LPSOCKADDR)next_addr; + (*addrs)[n].iSockaddrLength = sizeof(struct WS_sockaddr_in6); + next_addr++; + n++; + } + } + *num_addrs = n; + ret = ERROR_SUCCESS; + } + else + ret = ERROR_OUTOFMEMORY; + } + else + { + *addrs = NULL; + *num_addrs = 0; + ret = ERROR_SUCCESS; + } + freeifaddrs(ifa); + } + else + ret = ERROR_NO_DATA; + return ret; +} + #else /* Enumerates the IP addresses in the system using SIOCGIFCONF, returning @@ -886,78 +949,13 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) return ret; } -#endif - -#ifdef HAVE_IFADDRS_H -ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) -{ - struct ifaddrs *ifa; - ULONG ret; - - if (!getifaddrs(&ifa)) - { - struct ifaddrs *p; - ULONG n; - char name[IFNAMSIZ]; - - getInterfaceNameByIndex(index, name); - for (p = ifa, n = 0; p; p = p->ifa_next) - if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && - !strcmp(name, p->ifa_name)) - n++; - if (n) - { - *addrs = HeapAlloc(GetProcessHeap(), 0, n * (sizeof(SOCKET_ADDRESS) + - sizeof(struct WS_sockaddr_in6))); - if (*addrs) - { - struct WS_sockaddr_in6 *next_addr = (struct WS_sockaddr_in6 *)( - (BYTE *)*addrs + n * sizeof(SOCKET_ADDRESS)); - - for (p = ifa, n = 0; p; p = p->ifa_next) - { - if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && - !strcmp(name, p->ifa_name)) - { - struct sockaddr_in6 *addr = (struct sockaddr_in6 *)p->ifa_addr; - - next_addr->sin6_family = WS_AF_INET6; - next_addr->sin6_port = addr->sin6_port; - next_addr->sin6_flowinfo = addr->sin6_flowinfo; - memcpy(&next_addr->sin6_addr, &addr->sin6_addr, - sizeof(next_addr->sin6_addr)); - next_addr->sin6_scope_id = addr->sin6_scope_id; - (*addrs)[n].lpSockaddr = (LPSOCKADDR)next_addr; - (*addrs)[n].iSockaddrLength = sizeof(struct WS_sockaddr_in6); - next_addr++; - n++; - } - } - *num_addrs = n; - ret = ERROR_SUCCESS; - } - else - ret = ERROR_OUTOFMEMORY; - } - else - { - *addrs = NULL; - *num_addrs = 0; - ret = ERROR_SUCCESS; - } - freeifaddrs(ifa); - } - else - ret = ERROR_NO_DATA; - return ret; -} -#else ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) { *addrs = NULL; *num_addrs = 0; return ERROR_SUCCESS; } + #endif char *toIPAddressString(unsigned int addr, char string[16])

1 0

Juan Lang : iphlpapi: Remove an unmaintained comment, and update copyright.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 0de0796134209bd6318ea8031bf297cad8ce880b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de0796134209bd6318ea8031… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 13 08:30:38 2011 -0800 iphlpapi: Remove an unmaintained comment, and update copyright. --- dlls/iphlpapi/ifenum.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 7e0caf2..e749cce 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003,2006 Juan Lang +/* Copyright (C) 2003,2006,2011 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -13,18 +13,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * Implementation notes - * FIXME: - * - I don't support IPv6 addresses here, since SIOCGIFCONF can't return them - * - * There are three implemented methods for determining the MAC address of an - * interface: - * - a specific IOCTL (Linux) - * - looking in the ARP cache (at least Solaris) - * - using the sysctl interface (FreeBSD and Mac OS X) - * Solaris and some others have SIOCGENADDR, but I haven't gotten that to work - * on the Solaris boxes at SourceForge's compile farm, whereas SIOCGARP does. */ #include "config.h"

1 0

Francois Gouget : dsound: Unset Spare[0] before deleting non-static critical sections.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 0caef81de2e67dbf1eb7cbaea549371c51e48806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0caef81de2e67dbf1eb7cbaea… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 11:32:27 2011 +0100 dsound: Unset Spare[0] before deleting non-static critical sections. --- dlls/dsound/capture.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 9e289f3..4897e17 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1027,6 +1027,7 @@ static HRESULT DirectSoundCaptureDevice_Initialize( hr = IMMDevice_Activate(mmdevice, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&client); if(FAILED(hr)){ + device->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->lock); HeapFree(GetProcessHeap(), 0, device); LeaveCriticalSection(&DSOUND_capturers_lock);

1 0