May 2010 - Wine-Commits - list.winehq.org

Hans Leidekker : winedump: Print the network share name in .lnk files.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: f6612adcd29b99ae9488cb370c265d6384a7c3b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6612adcd29b99ae9488cb370… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 14 16:46:06 2010 +0200 winedump: Print the network share name in .lnk files. --- tools/winedump/lnk.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 98892c9..680e2de 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -118,6 +118,15 @@ typedef struct _LOCAL_VOLUME_INFO DWORD dwVolLabelOfs; } LOCAL_VOLUME_INFO; +typedef struct _NETWORK_VOLUME_INFO +{ + DWORD dwSize; + DWORD dwUnkown1; + DWORD dwShareNameOfs; + DWORD dwReserved; + DWORD dwUnknown2; +} NETWORK_VOLUME_INFO; + typedef struct { DWORD cbSize; @@ -232,9 +241,10 @@ static int dump_location(void) printf("Header size = %d\n", loc->dwHeaderSize); printf("Flags = %08x\n", loc->dwFlags); - /* dump out information about the volume the link points to */ - printf("Volume ofs = %08x ", loc->dwVolTableOfs); - if (loc->dwVolTableOfs && (loc->dwVolTableOfs<loc->dwTotalSize)) + /* dump information about the local volume the link points to */ + printf("Local volume ofs = %08x ", loc->dwVolTableOfs); + if (loc->dwVolTableOfs && + loc->dwVolTableOfs + sizeof(LOCAL_VOLUME_INFO) < loc->dwTotalSize) { const LOCAL_VOLUME_INFO *vol = (const LOCAL_VOLUME_INFO *)&p[loc->dwVolTableOfs]; @@ -245,6 +255,19 @@ static int dump_location(void) } printf("\n"); + /* dump information about the network volume the link points to */ + printf("Network volume ofs = %08x ", loc->dwNetworkVolTableOfs); + if (loc->dwNetworkVolTableOfs && + loc->dwNetworkVolTableOfs + sizeof(NETWORK_VOLUME_INFO) < loc->dwTotalSize) + { + const NETWORK_VOLUME_INFO *vol = (const NETWORK_VOLUME_INFO *)&p[loc->dwNetworkVolTableOfs]; + + printf("size %d name %d ", vol->dwSize, vol->dwShareNameOfs); + if(vol->dwShareNameOfs) + printf("(\"%s\")", &p[loc->dwNetworkVolTableOfs + vol->dwShareNameOfs]); + } + printf("\n"); + /* dump out the path the link points to */ printf("LocalPath ofs = %08x ", loc->dwLocalPathOfs); if( loc->dwLocalPathOfs && (loc->dwLocalPathOfs < loc->dwTotalSize) )

1 0

Hans Leidekker : ntdll: Add some tests for RtlIsTextUnicode.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: d1c8769b6449a6055b2681bab899922e70f6ac03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c8769b6449a6055b2681bab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 14 15:36:54 2010 +0200 ntdll: Add some tests for RtlIsTextUnicode. --- dlls/ntdll/tests/rtlstr.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 46d88c5..5dd3500 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1695,6 +1695,8 @@ static void test_RtlIntegerToChar(void) static void test_RtlIsTextUnicode(void) { char ascii[] = "A simple string"; + char false_positive[] = {0x41, 0x0a, 0x0d, 0x1d}; + WCHAR false_negative = 0x0d0a; WCHAR unicode[] = {'A',' ','U','n','i','c','o','d','e',' ','s','t','r','i','n','g',0}; WCHAR unicode_no_controls[] = {'A','U','n','i','c','o','d','e','s','t','r','i','n','g',0}; /* String with both byte-reversed and standard Unicode control characters. */ @@ -1810,6 +1812,11 @@ static void test_RtlIsTextUnicode(void) ok(!pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on string containing both byte-reversed and standard control characters.\n"); ok(flags == (IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_REVERSE_CONTROLS), "Expected flags 0x44, obtained %x\n", flags); + flags = IS_TEXT_UNICODE_STATISTICS; + todo_wine ok(pRtlIsTextUnicode(false_positive, sizeof(false_positive), &flags), "Test should pass on false positive.\n"); + + ok(!pRtlIsTextUnicode(&false_negative, sizeof(false_negative), NULL), "Test should fail on 0x0d0a (MALAYALAM LETTER UU).\n"); + HeapFree(GetProcessHeap(), 0, be_unicode); HeapFree(GetProcessHeap(), 0, be_unicode_no_controls); }

1 0

Hans Leidekker : hnetcfg: Return success from fw_port_get_Enabled.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: ccbf4c1b94ea7102afeeb3dba7393840e21b1dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccbf4c1b94ea7102afeeb3dba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 14 15:36:11 2010 +0200 hnetcfg: Return success from fw_port_get_Enabled. --- dlls/hnetcfg/port.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index c80b5f7..af821d6 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -270,7 +270,9 @@ static HRESULT WINAPI fw_port_get_Enabled( fw_port *This = impl_from_INetFwOpenPort( iface ); FIXME("%p %p\n", This, enabled); - return E_NOTIMPL; + + *enabled = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI fw_port_put_Enabled(

1 0

Hans Leidekker : winemenubuilder: Expand environment strings in the shortcut path.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 3c31a373d3461665affdce1115ae7f7e9d32537e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c31a373d3461665affdce111… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 14 15:35:55 2010 +0200 winemenubuilder: Expand environment strings in the shortcut path. --- programs/winemenubuilder/winemenubuilder.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index afa541a..4dc08d5 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2254,7 +2254,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) ExpandEnvironmentStringsW(szTmp, szDescription, INFOTIPSIZE); WINE_TRACE("description: %s\n", wine_dbgstr_w(szDescription)); - get_cmdline( sl, szPath, MAX_PATH, szArgs, INFOTIPSIZE); + get_cmdline( sl, szTmp, MAX_PATH, szArgs, INFOTIPSIZE); + ExpandEnvironmentStringsW(szTmp, szPath, MAX_PATH); WINE_TRACE("path : %s\n", wine_dbgstr_w(szPath)); WINE_TRACE("args : %s\n", wine_dbgstr_w(szArgs));

1 0

Alexandre Julliard : comctl32: Always alpha blend images for 32-bpp imagelists.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 91948f9ce84735c61cf733e767929fac541b0977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91948f9ce84735c61cf733e76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 13:50:38 2010 +0200 comctl32: Always alpha blend images for 32-bpp imagelists. --- dlls/comctl32/imagelist.c | 36 ++++++++++++++++++++++-------------- dlls/comctl32/tests/imagelist.c | 2 +- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 2083d39..bd1530e 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1142,16 +1142,15 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, - int src_x, int src_y, int cx, int cy, int alpha ) + int src_x, int src_y, int cx, int cy, BLENDFUNCTION func ) { - BLENDFUNCTION func; BOOL ret = FALSE; HDC hdc; HBITMAP bmp = 0, mask = 0; BITMAPINFO *info; void *bits, *mask_bits; unsigned int *ptr; - int i, j, has_alpha = 0; + int i, j; if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; @@ -1170,8 +1169,6 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des SelectObject( hdc, bmp ); BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); - for (i = 0, ptr = bits; i < cx * cy; i++) if ((has_alpha = (ptr[i] & 0xff000000) != 0)) break; - if (himl->hbmMask) { unsigned int width_bytes = (cx + 31) / 32 * 4; @@ -1186,13 +1183,9 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des for (i = 0, ptr = bits; i < cy; i++) for (j = 0; j < cx; j++, ptr++) if ((((BYTE *)mask_bits)[i * width_bytes + j / 8] << (j % 8)) & 0x80) *ptr = 0; - else if (!has_alpha) *ptr |= 0xff000000; + else *ptr |= 0xff000000; } - func.BlendOp = AC_SRC_OVER; - func.BlendFlags = 0; - func.SourceConstantAlpha = alpha; - func.AlphaFormat = AC_SRC_ALPHA; ret = GdiAlphaBlend( dest_dc, dest_x, dest_y, cx, cy, hdc, 0, 0, cx, cy, func ); done: @@ -1229,6 +1222,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) HIMAGELIST himl; HBRUSH hOldBrush; POINT pt; + BOOL has_alpha; if (!pimldp || !(himl = pimldp->himl)) return FALSE; if (!is_valid(himl)) return FALSE; @@ -1278,14 +1272,25 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) ); oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); - if (fState & ILS_ALPHA) + has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); + if (!bMask && (has_alpha || (fState & ILS_ALPHA))) { COLORREF colour; + BLENDFUNCTION func; + + func.BlendOp = AC_SRC_OVER; + func.BlendFlags = 0; + func.SourceConstantAlpha = (fState & ILS_ALPHA) ? pimldp->Frame : 255; + func.AlphaFormat = AC_SRC_ALPHA; if (bIsTransparent) { - bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, - pt.x, pt.y, cx, cy, pimldp->Frame ); + if (himl->uBitsPixel == 32) /* we already have an alpha channel in this case */ + bResult = GdiAlphaBlend( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, + himl->hdcImage, pt.x, pt.y, cx, cy, func ); + else + bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, + pt.x, pt.y, cx, cy, func ); goto end; } colour = pimldp->rgbBk; @@ -1294,7 +1299,10 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, pimldp->Frame ); + if (himl->uBitsPixel == 32) + GdiAlphaBlend( hImageDC, 0, 0, cx, cy, himl->hdcImage, pt.x, pt.y, cx, cy, func ); + else + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index b80f351..43eeeca 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1201,7 +1201,7 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x005D6F81, __LINE__); } - todo_wine check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iTransparentImage, ILD_NORMAL, 0x00FFFFFF, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iTransparentImage, ILD_NORMAL, 0x00FFFFFF, __LINE__); check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iImage, SRCCOPY, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iImage, SRCINVERT, 0x00543210, __LINE__);

1 0

Alexandre Julliard : comctl32: Generate an alpha channel if necessary when adding images to a 32-bit imagelist .
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: f02adf3e2b3efc23f62c38b9c8f43f169888434f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02adf3e2b3efc23f62c38b9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 13:38:54 2010 +0200 comctl32: Generate an alpha channel if necessary when adding images to a 32-bit imagelist. --- dlls/comctl32/imagelist.c | 110 +++++++++++++++++++++++++++++++++++---- dlls/comctl32/tests/imagelist.c | 2 +- 2 files changed, 101 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index d1bf7f6..acad6c2 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -138,6 +138,92 @@ static inline void imagelist_copy_images( HIMAGELIST himl, HDC hdcSrc, HDC hdcDe } } +/* add images with an alpha channel when the image list is 32 bpp */ +static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, + int width, int height, HBITMAP hbmImage, HBITMAP hbmMask ) +{ + BOOL ret = FALSE; + HDC hdcMask = 0; + BITMAP bm; + BITMAPINFO *info; + DWORD *bits = NULL; + BYTE *mask_bits = NULL; + int i, j, n; + POINT pt; + DWORD mask_width; + + if (himl->uBitsPixel != 32) return FALSE; + if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE; + SelectObject( hdc, hbmImage ); + mask_width = (bm.bmWidth + 31) / 32 * 4; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = bm.bmWidth; + info->bmiHeader.biHeight = -height; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = bm.bmWidth * height * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (!(bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; + if (!GetDIBits( hdc, hbmImage, 0, height, bits, info, DIB_RGB_COLORS )) goto done; + + if (hbmMask) + { + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biSizeImage = mask_width * height; + if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; + if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS )) goto done; + /* restore values for color info */ + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biSizeImage = bm.bmWidth * height * 4; + hdcMask = CreateCompatibleDC( 0 ); + SelectObject( hdcMask, hbmMask ); + } + + for (n = 0; n < count; n++) + { + int has_alpha = 0; + + imagelist_point_from_index( himl, pos + n, &pt ); + + /* check if bitmap has an alpha channel */ + for (i = 0; i < height && !has_alpha; i++) + for (j = n * width; j < (n + 1) * width; j++) + if ((has_alpha = ((bits[i * bm.bmWidth + j] & 0xff000000) != 0))) break; + + if (!has_alpha) /* generate alpha channel from the mask */ + { + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + if (!mask_bits || !((mask_bits[i * mask_width + j / 8] << (j % 8)) & 0x80)) + bits[i * bm.bmWidth + j] |= 0xff000000; + StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, + n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); + } + else + { + StretchBlt( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, + hdc, n * width, 0, width, height, SRCCOPY ); + } + + if (hdcMask) StretchBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + hdcMask, n * width, 0, width, height, SRCCOPY ); + } + ret = TRUE; + +done: + if (hdcMask) DeleteDC( hdcMask ); + HeapFree( GetProcessHeap(), 0, info ); + HeapFree( GetProcessHeap(), 0, bits ); + HeapFree( GetProcessHeap(), 0, mask_bits ); + return ret; +} + /************************************************************************* * IMAGELIST_InternalExpandBitmaps [Internal] * @@ -232,10 +318,9 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) INT WINAPI ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask) { - HDC hdcBitmap, hdcTemp; + HDC hdcBitmap, hdcTemp = 0; INT nFirstIndex, nImageCount, i; BITMAP bmp; - HBITMAP hOldBitmap, hOldBitmapTemp; POINT pt; TRACE("himl=%p hbmimage=%p hbmmask=%p\n", himl, hbmImage, hbmMask); @@ -256,7 +341,17 @@ ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask) hdcBitmap = CreateCompatibleDC(0); - hOldBitmap = SelectObject(hdcBitmap, hbmImage); + SelectObject(hdcBitmap, hbmImage); + + if (add_with_alpha( himl, hdcBitmap, himl->cCurImage, nImageCount, + himl->cx, min( himl->cy, bmp.bmHeight), hbmImage, hbmMask )) + goto done; + + if (himl->hbmMask) + { + hdcTemp = CreateCompatibleDC(0); + SelectObject(hdcTemp, hbmMask); + } for (i=0; i<nImageCount; i++) { @@ -270,22 +365,17 @@ ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask) if (!himl->hbmMask) continue; - hdcTemp = CreateCompatibleDC(0); - hOldBitmapTemp = SelectObject(hdcTemp, hbmMask); - BitBlt( himl->hdcMask, pt.x, pt.y, himl->cx, bmp.bmHeight, hdcTemp, i*himl->cx, 0, SRCCOPY ); - SelectObject(hdcTemp, hOldBitmapTemp); - DeleteDC(hdcTemp); - /* Remove the background from the image */ BitBlt( himl->hdcImage, pt.x, pt.y, himl->cx, bmp.bmHeight, himl->hdcMask, pt.x, pt.y, 0x220326 ); /* NOTSRCAND */ } + if (hdcTemp) DeleteDC(hdcTemp); - SelectObject(hdcBitmap, hOldBitmap); +done: DeleteDC(hdcBitmap); nFirstIndex = himl->cCurImage; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 9542e64..b80f351 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1216,7 +1216,7 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_GLOW, 0, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SHADOW, 0, 0x00ABCDEF, __LINE__); - todo_wine check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00D5E6F7, __LINE__); + check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00D5E6F7, __LINE__); todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00E9F2FB, 0x00AEB7C0, __LINE__); todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_NORMAL, 127, 0x00E9F2FB, 0x00D3E5F7, __LINE__);

1 0

Mike Kaplinskiy : server: Get rid of sock_try_event.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 4f9e09ea5732d088b736bc2dc1cf8a928e983870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9e09ea5732d088b736bc2dc… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Thu May 13 16:42:04 2010 -0400 server: Get rid of sock_try_event. We *might* need to ignore POLLERR messages for UDP sockets, as the condition is actually temporary and sock_try_event was hiding this. --- server/sock.c | 24 +++--------------------- 1 files changed, 3 insertions(+), 21 deletions(-) diff --git a/server/sock.c b/server/sock.c index 75a9d00..d2348e4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -254,18 +254,6 @@ static int sock_reselect( struct sock *sock ) return ev; } -/* After POLLHUP is received, the socket will no longer be in the main select loop. - This function is used to signal pending events nevertheless */ -static void sock_try_event( struct sock *sock, int event ) -{ - event = check_fd_events( sock->fd, event ); - if (event) - { - if ( debug_level ) fprintf( stderr, "sock_try_event: %x\n", event ); - sock_poll_event( sock->fd, event ); - } -} - /* wake anybody waiting on the socket event or send the associated message */ static void sock_wake_up( struct sock *sock, int pollev ) { @@ -509,7 +497,6 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, { struct sock *sock = get_fd_user( fd ); struct async_queue *queue; - int pollev; assert( sock->obj.ops == &sock_ops ); @@ -541,15 +528,13 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, set_error( STATUS_PENDING ); } - pollev = sock_reselect( sock ); - if ( pollev ) sock_try_event( sock, pollev ); + sock_reselect( sock ); } static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) { struct sock *sock = get_fd_user( fd ); - int events = sock_reselect( sock ); - if (events) sock_try_event( sock, events ); + sock_reselect( sock ); } static void sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ) @@ -883,7 +868,6 @@ DECL_HANDLER(set_socket_event) if (debug_level && sock->event) fprintf(stderr, "event ptr: %p\n", sock->event); pollev = sock_reselect( sock ); - if ( pollev ) sock_try_event( sock, pollev ); if (sock->mask) sock->state |= FD_WINE_NONBLOCKING; @@ -943,7 +927,6 @@ DECL_HANDLER(get_socket_event) DECL_HANDLER(enable_socket_event) { struct sock *sock; - int pollev; if (!(sock = (struct sock*)get_handle_obj( current->process, req->handle, FILE_WRITE_ATTRIBUTES, &sock_ops))) @@ -955,8 +938,7 @@ DECL_HANDLER(enable_socket_event) sock->state &= ~req->cstate; if ( sock->type != SOCK_STREAM ) sock->state &= ~STREAM_FLAG_MASK; - pollev = sock_reselect( sock ); - if ( pollev ) sock_try_event( sock, pollev ); + sock_reselect( sock ); release_object( &sock->obj ); }

1 0

Mike Kaplinskiy : server: Always treat POLLHUP as a hangup, just special case checking TCP sockets.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: d03fe9d4ecc98218516d263a0eeccb4928404658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03fe9d4ecc98218516d263a0… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Thu May 13 16:41:58 2010 -0400 server: Always treat POLLHUP as a hangup, just special case checking TCP sockets. --- server/sock.c | 37 ++++++++++++++++--------------------- 1 files changed, 16 insertions(+), 21 deletions(-) diff --git a/server/sock.c b/server/sock.c index a893863..75a9d00 100644 --- a/server/sock.c +++ b/server/sock.c @@ -329,6 +329,10 @@ static void sock_poll_event( struct fd *fd, int event ) assert( sock->obj.ops == &sock_ops ); if (debug_level) fprintf(stderr, "socket %p select event: %x\n", sock, event); + + /* we may change event later, remove from loop here */ + if (event & (POLLERR|POLLHUP)) set_fd_events( sock->fd, -1 ); + if (sock->state & FD_CONNECT) { /* connecting */ @@ -382,28 +386,25 @@ static void sock_poll_event( struct fd *fd, int event ) * has been closed, so we need to check for it explicitly here */ nr = recv( get_unix_fd( fd ), &dummy, 1, MSG_PEEK ); if ( nr == 0 ) + { hangup_seen = 1; + event &= ~POLLIN; + } else if ( nr < 0 ) { + event &= ~POLLIN; /* EAGAIN can happen if an async recv() falls between the server's poll() call and the invocation of this routine */ - if ( errno == EAGAIN ) - event &= ~POLLIN; - else + if ( errno != EAGAIN ) { if ( debug_level ) fprintf( stderr, "recv error on socket %p: %d\n", sock, errno ); - event = POLLERR; + event |= POLLERR; } } - - } - else if ( sock_shutdown_type == SOCK_SHUTDOWN_POLLHUP && (event & POLLHUP) ) - { - hangup_seen = 1; } - if ( event & POLLIN && !hangup_seen ) + if ( event & POLLIN ) { sock->pmask |= FD_READ; sock->hmask |= FD_READ; @@ -429,9 +430,7 @@ static void sock_poll_event( struct fd *fd, int event ) fprintf(stderr, "socket %p got OOB data\n", sock); } - /* According to WS2 specs, FD_CLOSE is only delivered when there is - no more data to be read (i.e. hangup_seen = 1) */ - if ( hangup_seen && (sock->state & (FD_READ|FD_WRITE) )) + if ( (hangup_seen || event & (POLLHUP|POLLERR)) && (sock->state & (FD_READ|FD_WRITE)) ) { sock->errors[FD_CLOSE_BIT] = sock_error( fd ); if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) @@ -444,16 +443,10 @@ static void sock_poll_event( struct fd *fd, int event ) fprintf(stderr, "socket %p aborted by error %d, event: %x - removing from select loop\n", sock, sock->errors[FD_CLOSE_BIT], event); } - } - if ( event & (POLLERR|POLLHUP) ) - { - if ( debug_level ) - fprintf( stderr, "removing socket %p from select loop\n", sock ); - set_fd_events( sock->fd, -1 ); + if (hangup_seen) + event |= POLLHUP; } - else - sock_reselect( sock ); /* wake up anyone waiting for whatever just happened */ if ( sock->pmask & sock->mask || sock->flags & WSA_FLAG_OVERLAPPED ) sock_wake_up( sock, event ); @@ -461,6 +454,8 @@ static void sock_poll_event( struct fd *fd, int event ) /* if anyone is stupid enough to wait on the socket object itself, * maybe we should wake them up too, just in case? */ wake_up( &sock->obj, 0 ); + + sock_reselect( sock ); } static void sock_dump( struct object *obj, int verbose )

1 0

Alexandre Julliard : ws2_32/tests: Fix non-portable syntax.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 861989596fc067045d19160c7349aad525462f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=861989596fc067045d19160c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 11:42:43 2010 +0200 ws2_32/tests: Fix non-portable syntax. --- dlls/ws2_32/tests/sock.c | 104 ++++++++++++++++++++++++++++------------------ 1 files changed, 64 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=861989596fc067045d191…

1 0

Alexandre Julliard : Fix the bitmap info size computation when masks are present.
by Alexandre Julliard May 14, 2010

May 14, 2010

Module: wine Branch: master Commit: 162d95a3cea74ce2a25f3af02a8ad935e85d66ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=162d95a3cea74ce2a25f3af02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 17:17:46 2010 +0200 Fix the bitmap info size computation when masks are present. --- dlls/gdi32/dib.c | 6 +++--- dlls/user32/cursoricon.c | 6 +++--- dlls/winex11.drv/dib.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 1b34a34..b19cb9d 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -123,7 +123,7 @@ int DIB_GetDIBImageBytes( int width, int height, int depth ) */ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) { - int colors, masks = 0; + unsigned int colors, size, masks = 0; if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { @@ -139,8 +139,8 @@ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; - return info->bmiHeader.biSize + masks * sizeof(DWORD) + colors * - ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); + return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } } diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 96827c2..8cccbbe 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -304,7 +304,7 @@ static int get_dib_width_bytes( int width, int depth ) */ static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) { - int colors, masks = 0; + unsigned int colors, size, masks = 0; if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { @@ -321,8 +321,8 @@ static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; - return info->bmiHeader.biSize + masks * sizeof(DWORD) + colors * - ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); + return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } } diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 95e3511..cf58e8b 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -193,7 +193,7 @@ static int X11DRV_DIB_GetDIBImageBytes( int width, int height, int depth ) */ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) { - unsigned int colors, masks = 0; + unsigned int colors, size, masks = 0; if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { @@ -208,8 +208,8 @@ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; - return info->bmiHeader.biSize + masks * sizeof(DWORD) + colors * - ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); + return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } }

1 0