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

Hans Leidekker : hnetcfg: Return success from fw_port_get_Enabled.
by Alexandre Julliard 14 May '10

14 May '10

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 : fltlib: Add stub implementations of FilterFindFirst and FilterFindClose.
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: 14e061a5c40c31d0d99437de1a3bf26edcffe3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e061a5c40c31d0d99437de1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 14 15:36:25 2010 +0200 fltlib: Add stub implementations of FilterFindFirst and FilterFindClose. --- dlls/fltlib/fltlib.c | 19 +++++++++++++++++++ dlls/fltlib/fltlib.spec | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c index acd202f..9975a29 100644 --- a/dlls/fltlib/fltlib.c +++ b/dlls/fltlib/fltlib.c @@ -58,3 +58,22 @@ HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOption *hPort = INVALID_HANDLE_VALUE; return E_NOTIMPL; } + +/********************************************************************** + * FilterFindFirst (FLTLIB.@) + */ +HRESULT WINAPI FilterFindFirst(DWORD class, LPVOID buffer, DWORD size, LPDWORD bytes_returned, + LPHANDLE handle) +{ + FIXME("%u, %p, %u, %p, %p\n", class, buffer, size, bytes_returned, handle); + return HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS); +} + +/********************************************************************** + * FilterFindClose (FLTLIB.@) + */ +HRESULT WINAPI FilterFindClose(HANDLE handle) +{ + FIXME("%p\n", handle); + return S_OK; +} diff --git a/dlls/fltlib/fltlib.spec b/dlls/fltlib/fltlib.spec index 9c84601..ecf5893 100644 --- a/dlls/fltlib/fltlib.spec +++ b/dlls/fltlib/fltlib.spec @@ -4,8 +4,8 @@ @ stdcall FilterConnectCommunicationPort(wstr long ptr long ptr ptr) @ stub FilterCreate @ stub FilterDetach -@ stub FilterFindClose -@ stub FilterFindFirst +@ stdcall FilterFindClose(ptr) +@ stdcall FilterFindFirst(long ptr long ptr ptr) @ stub FilterFindNext @ stub FilterGetDosName @ stub FilterGetInformation

1 0

Hans Leidekker : winhttp: Support setting security flags on request handles .
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: 41e147e68f967e810579121bbd28a37d0560d703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e147e68f967e810579121bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 14 15:36:39 2010 +0200 winhttp: Support setting security flags on request handles. --- dlls/winhttp/session.c | 21 ++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 82da721..5557250 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -723,8 +723,27 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe return TRUE; } case WINHTTP_OPTION_SECURITY_FLAGS: - FIXME("WINHTTP_OPTION_SECURITY_FLAGS unimplemented (%08x)\n", *(DWORD *)buffer); + { + DWORD flags; + + if (buflen < sizeof(DWORD)) + { + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + flags = *(DWORD *)buffer; + TRACE("0x%x\n", flags); + if (!(flags & (SECURITY_FLAG_IGNORE_CERT_CN_INVALID | + SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | + SECURITY_FLAG_IGNORE_UNKNOWN_CA | + SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE))) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + request->security_flags = flags; return TRUE; + } case WINHTTP_OPTION_RESOLVE_TIMEOUT: request->resolve_timeout = *(DWORD *)buffer; return TRUE; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index abf5f8a..43961fe 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -155,6 +155,7 @@ typedef struct DWORD content_read; /* bytes read so far */ header_t *headers; DWORD num_headers; + DWORD security_flags; } request_t; typedef struct _task_header_t task_header_t;

1 0

Hans Leidekker : ntdll: Add some tests for RtlIsTextUnicode.
by Alexandre Julliard 14 May '10

14 May '10

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

Alexandre Julliard : ws2_32/tests: Fix non-portable syntax.
by Alexandre Julliard 14 May '10

14 May '10

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

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

14 May '10

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

Mike Kaplinskiy : server: Get rid of sock_try_event.
by Alexandre Julliard 14 May '10

14 May '10

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

Alexandre Julliard : comctl32: Make ImageList_AddMasked call ImageList_Add instead of duplicating the functionality .
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: f75c7b5f71e4154f98975078db01e01dbc11f624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75c7b5f71e4154f98975078d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 13:37:04 2010 +0200 comctl32: Make ImageList_AddMasked call ImageList_Add instead of duplicating the functionality. --- dlls/comctl32/imagelist.c | 36 +++++++----------------------------- 1 files changed, 7 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index cf6fe97..d1bf7f6 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -335,12 +335,10 @@ INT WINAPI ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) { HDC hdcMask, hdcBitmap; - INT i, nIndex, nImageCount; + INT ret; BITMAP bmp; - HBITMAP hOldBitmap; - HBITMAP hMaskBitmap=0; + HBITMAP hMaskBitmap; COLORREF bkColor; - POINT pt; TRACE("himl=%p hbitmap=%p clrmask=%x\n", himl, hBitmap, clrMask); if (!is_valid(himl)) @@ -349,18 +347,8 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) if (!GetObjectW(hBitmap, sizeof(BITMAP), &bmp)) return -1; - if (himl->cx > 0) - nImageCount = bmp.bmWidth / himl->cx; - else - nImageCount = 0; - - IMAGELIST_InternalExpandBitmaps(himl, nImageCount); - - nIndex = himl->cCurImage; - himl->cCurImage += nImageCount; - hdcBitmap = CreateCompatibleDC(0); - hOldBitmap = SelectObject(hdcBitmap, hBitmap); + SelectObject(hdcBitmap, hBitmap); /* Create a temp Mask so we can remove the background of the Image */ hdcMask = CreateCompatibleDC(0); @@ -389,23 +377,13 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) */ BitBlt(hdcBitmap, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcMask, 0, 0, 0x220326); - /* Copy result to the imagelist */ - for (i=0; i<nImageCount; i++) - { - imagelist_point_from_index( himl, nIndex + i, &pt ); - BitBlt(himl->hdcImage, pt.x, pt.y, himl->cx, bmp.bmHeight, - hdcBitmap, i*himl->cx, 0, SRCCOPY); - BitBlt(himl->hdcMask, pt.x, pt.y, himl->cx, bmp.bmHeight, - hdcMask, i*himl->cx, 0, SRCCOPY); - } - - /* Clean up */ - SelectObject(hdcBitmap, hOldBitmap); DeleteDC(hdcBitmap); - DeleteObject(hMaskBitmap); DeleteDC(hdcMask); - return nIndex; + ret = ImageList_Add( himl, hBitmap, hMaskBitmap ); + + DeleteObject(hMaskBitmap); + return ret; }

1 0

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

14 May '10

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

Alexandre Julliard : comctl32: Also generate an alpha channel when replacing an image or icon in an imagelist .
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: 528722e4e16ec918d5daf3bee8bbb95fd35a7582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=528722e4e16ec918d5daf3bee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 13:41:35 2010 +0200 comctl32: Also generate an alpha channel when replacing an image or icon in an imagelist. --- dlls/comctl32/imagelist.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index acad6c2..1eb3bc6 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2305,7 +2305,6 @@ ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage, { HDC hdcImage; BITMAP bmp; - HBITMAP hOldBitmap; POINT pt; TRACE("%p %d %p %p\n", himl, i, hbmImage, hbmMask); @@ -2326,7 +2325,10 @@ ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage, hdcImage = CreateCompatibleDC (0); /* Replace Image */ - hOldBitmap = SelectObject (hdcImage, hbmImage); + SelectObject (hdcImage, hbmImage); + + if (add_with_alpha( himl, hdcImage, i, 1, bmp.bmWidth, bmp.bmHeight, hbmImage, hbmMask )) + goto done; imagelist_point_from_index(himl, i, &pt); StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, @@ -2351,7 +2353,7 @@ ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage, himl->hdcMask, pt.x, pt.y, 0x220326); /* NOTSRCAND */ } - SelectObject (hdcImage, hOldBitmap); +done: DeleteDC (hdcImage); return TRUE; @@ -2378,7 +2380,6 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) { HDC hdcImage; HICON hBestFitIcon; - HBITMAP hbmOldSrc; ICONINFO ii; BITMAP bmp; BOOL ret; @@ -2439,6 +2440,25 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (hdcImage == 0) ERR("invalid hdcImage!\n"); + if (himl->uBitsPixel == 32) + { + if (!ii.hbmColor) + { + UINT height = bmp.bmHeight / 2; + HDC hdcMask = CreateCompatibleDC( 0 ); + HBITMAP color = CreateBitmap( bmp.bmWidth, height, 1, 1, NULL ); + SelectObject( hdcImage, color ); + SelectObject( hdcMask, ii.hbmMask ); + BitBlt( hdcImage, 0, 0, bmp.bmWidth, height, hdcMask, 0, height, SRCCOPY ); + add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask ); + DeleteDC( hdcMask ); + DeleteObject( color ); + } + else add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, ii.hbmColor, ii.hbmMask ); + + goto done; + } + imagelist_point_from_index(himl, nIndex, &pt); SetTextColor(himl->hdcImage, RGB(0,0,0)); @@ -2446,7 +2466,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (ii.hbmColor) { - hbmOldSrc = SelectObject (hdcImage, ii.hbmColor); + SelectObject (hdcImage, ii.hbmColor); StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); if (himl->hbmMask) @@ -2459,7 +2479,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) else { UINT height = bmp.bmHeight / 2; - hbmOldSrc = SelectObject (hdcImage, ii.hbmMask); + SelectObject (hdcImage, ii.hbmMask); StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, hdcImage, 0, height, bmp.bmWidth, height, SRCCOPY); if (himl->hbmMask) @@ -2467,8 +2487,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) hdcImage, 0, 0, bmp.bmWidth, height, SRCCOPY); } - SelectObject (hdcImage, hbmOldSrc); - +done: DestroyIcon(hBestFitIcon); if (hdcImage) DeleteDC (hdcImage);

1 0