December 2010 - Wine-Commits

Juan Lang : wininet: Don't retrieve a certificate that isn't used.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 8dd32cff81e0629e62f7f3f06c915801bf223e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd32cff81e0629e62f7f3f06… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 18:10:40 2010 -0700 wininet: Don't retrieve a certificate that isn't used. (cherry picked from commit 181a367a1f77ae3b88e0e36dcad7b0840b920de6) --- dlls/wininet/netconnection.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 12aef21..08152f5 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -641,7 +641,6 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL long verify_res; - X509 *cert; /* can't connect if we are already connected */ if (connection->useSSL) @@ -689,14 +688,6 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; goto fail; } - cert = pSSL_get_peer_certificate(connection->ssl_s); - if (!cert) - { - ERR("no certificate for server %s\n", debugstr_w(hostname)); - /* FIXME: is this the best error? */ - res = ERROR_INTERNET_INVALID_CA; - goto fail; - } verify_res = pSSL_get_verify_result(connection->ssl_s); if (verify_res != X509_V_OK) {

1 0

Wolfram Sang : user32: Check for valid pointer in CreateIconFromResource.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 25520c19f7ceb1c12cf6e2aca235cd0e8eeb9ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25520c19f7ceb1c12cf6e2aca… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Aug 4 16:05:00 2010 +0200 user32: Check for valid pointer in CreateIconFromResource. (cherry picked from commit 9f0f17f8535879ed4807226062310e0858207026) --- dlls/user32/cursoricon.c | 5 +++-- dlls/user32/tests/cursoricon.c | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 9a1810e..938f0dd 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1064,8 +1064,6 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, TRACE("bits %p, bits_size %d\n", bits, bits_size); - if (!bits) return 0; - riff_find_chunk( ANI_ACON_ID, ANI_RIFF_ID, &root_chunk, &ACON_chunk ); if (!ACON_chunk.data) { @@ -1104,6 +1102,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, width, height, depth ); frame_bits = HeapAlloc( GetProcessHeap(), 0, entry->dwDIBSize ); + if (!frame_bits) return 0; memcpy( frame_bits, icon_data + entry->dwDIBOffset, entry->dwDIBSize ); if (!header.width || !header.height) @@ -1142,6 +1141,8 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, bits, cbSize, dwVersion, width, height, bIcon ? "icon" : "cursor", (cFlag & LR_MONOCHROME) ? "mono" : "" ); + if (!bits) return 0; + if (bIcon) { hotspot.x = width / 2; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index b2e1d84..e81e76d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1005,6 +1005,11 @@ static void test_CreateIconFromResource(void) error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); + /* Rejection of NULL pointer crashes at least on WNT4WSSP6, W2KPROSP4, WXPPROSP3 + * + * handle = CreateIconFromResource(NULL, ICON_RES_SIZE, TRUE, 0x00030000); + * ok(handle == NULL, "Invalid pointer accepted (%p)\n", handle); + */ HeapFree(GetProcessHeap(), 0, hotspot); }

1 0

Gerald Pfeifer : user32: Fix error handling in BITMAP_Load.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 1ee3e39658fcbd5fdb3626677e53b95146dad106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee3e39658fcbd5fdb3626677… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 16:10:39 2010 +0200 user32: Fix error handling in BITMAP_Load. (cherry picked from commit 824ab969ff1c5e0e3706d37855f4652244e295d9) --- dlls/user32/cursoricon.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 938f0dd..acae302 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -366,7 +366,7 @@ static BOOL is_dib_monochrome( const BITMAPINFO* info ) * DIB_GetBitmapInfo * * Get the info from a bitmap header. - * Return 1 for INFOHEADER, 0 for COREHEADER, + * Return 1 for INFOHEADER, 0 for COREHEADER, -1 in case of failure. */ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, LONG *height, WORD *bpp, DWORD *compr ) @@ -2257,6 +2257,12 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, memcpy(scaled_info, fix_info, size); bm_type = DIB_GetBitmapInfo( &fix_info->bmiHeader, &width, &height, &bpp_dummy, &compr_dummy); + if (bm_type == -1) + { + WARN("Invalid bitmap format!\n"); + goto end_close; + } + if(desiredx != 0) new_width = desiredx; else

1 0

Erich Hoover : user32: Add support for multiple frames in cursor format.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: e3275b9d1d65a6a30cdc481447081f9a1c0545d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3275b9d1d65a6a30cdc48144… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 26 12:26:23 2010 -0600 user32: Add support for multiple frames in cursor format. (cherry picked from commit 7bba6234e30dbb8e7bccab2b076d5174d0f72bbb) --- dlls/user32/cursoricon.c | 173 +++++++++++++++++++++++++++++----------------- 1 files changed, 110 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3275b9d1d65a6a30cdc4…

1 0

Damjan Jovanovic : comdlg32: Fix a stack overflow.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: ea3f9bdb84337575fc68dbf42d26474c6d6ed374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3f9bdb84337575fc68dbf42… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Oct 8 07:21:23 2010 +0200 comdlg32: Fix a stack overflow. (cherry picked from commit 7ccf6c28b31ed2486600e0b23649d3fecaab0248) --- dlls/comdlg32/filedlg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index ae357f6..c689584 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3129,6 +3129,9 @@ static int FILEDLG95_LOOKIN_InsertItemAfterParent(HWND hwnd,LPITEMIDLIST pidl) TRACE("\n"); + if (pidl == pidlParent) + return -1; + iParentPos = FILEDLG95_LOOKIN_SearchItem(hwnd,(WPARAM)pidlParent,SEARCH_PIDL); if(iParentPos < 0)

1 0

Michael Stefaniuc : user32: Simplify the error handling in BITMAP_Load().
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 6be61d1c2d3d6f1f270ccd7985aca0087dac6629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be61d1c2d3d6f1f270ccd798… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:45:21 2010 +0200 user32: Simplify the error handling in BITMAP_Load(). This fixes a memleak on an error path (Smatch). (cherry picked from commit 5a2cc9410586b32aacdb9a878686b68d96e941ab) --- dlls/user32/cursoricon.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index acae302..6b0e0f9 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2239,7 +2239,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bmfh->bfType != 0x4d42 /* 'BM' */) { WARN("Invalid/unsupported bitmap format!\n"); - goto end_close; + goto end; } if (bmfh->bfOffBits) offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } @@ -2260,7 +2260,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bm_type == -1) { WARN("Invalid bitmap format!\n"); - goto end_close; + goto end; } if(desiredx != 0) @@ -2319,7 +2319,6 @@ end: if (screen_mem_dc) DeleteDC(screen_mem_dc); HeapFree(GetProcessHeap(), 0, scaled_info); HeapFree(GetProcessHeap(), 0, fix_info); -end_close: if (loadflags & LR_LOADFROMFILE) UnmapViewOfFile( ptr ); return hbitmap;

1 0

Erich Hoover : user32: Prepare for multi-frame storing of icons and cursors .
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 2d5aa664d6df174d2c74398d64231ee8ef77eba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5aa664d6df174d2c74398d6… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Sep 25 21:37:23 2010 -0600 user32: Prepare for multi-frame storing of icons and cursors. (cherry picked from commit ca7163e4386f576d8fd3b3f0c53b43522da4c437) --- dlls/user32/cursoricon.c | 65 ++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6b0e0f9..db73704 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -110,17 +110,22 @@ static CRITICAL_SECTION IconCrst = { &critsect_debug, -1, 0, 0, 0, 0 }; * User objects management */ -struct cursoricon_object +struct cursoricon_frame { - struct user_object obj; /* object header */ - ULONG_PTR param; /* opaque param used by 16-bit code */ HBITMAP color; /* color bitmap */ HBITMAP alpha; /* pre-multiplied alpha bitmap for 32-bpp icons */ HBITMAP mask; /* mask bitmap (followed by color for 1-bpp icons) */ - BOOL is_icon; /* whether icon or cursor */ - UINT width; - UINT height; - POINT hotspot; +}; + +struct cursoricon_object +{ + struct user_object obj; /* object header */ + ULONG_PTR param; /* opaque param used by 16-bit code */ + BOOL is_icon; /* whether icon or cursor */ + UINT width; + UINT height; + POINT hotspot; + struct cursoricon_frame frame; /* icon frame information */ }; static HICON alloc_icon_handle(void) @@ -128,9 +133,9 @@ static HICON alloc_icon_handle(void) struct cursoricon_object *obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ); if (!obj) return 0; obj->param = 0; - obj->color = 0; - obj->alpha = 0; - obj->mask = 0; + obj->frame.color = 0; + obj->frame.mask = 0; + obj->frame.alpha = 0; return alloc_user_handle( &obj->obj, USER_ICON ); } @@ -158,9 +163,9 @@ static BOOL free_icon_handle( HICON handle ) else if (obj) { ULONG_PTR param = obj->param; - if (obj->color) DeleteObject( obj->color ); - if (obj->alpha) DeleteObject( obj->alpha ); - DeleteObject( obj->mask ); + if (obj->frame.alpha) DeleteObject( obj->frame.alpha ); + if (obj->frame.color) DeleteObject( obj->frame.color ); + DeleteObject( obj->frame.mask ); HeapFree( GetProcessHeap(), 0, obj ); if (wow_handlers.free_icon_param && param) wow_handlers.free_icon_param( param ); USER_Driver->pDestroyCursorIcon( handle ); @@ -921,13 +926,13 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, { struct cursoricon_object *info = get_icon_ptr( hObj ); - info->color = color; - info->mask = mask; - info->alpha = alpha; info->is_icon = bIcon; info->hotspot = hotspot; info->width = width; info->height = height; + info->frame.color = color; + info->frame.mask = mask; + info->frame.alpha = alpha; release_icon_ptr( hObj, info ); USER_Driver->pCreateCursorIcon( hObj ); } @@ -1532,13 +1537,13 @@ HICON WINAPI CopyIcon( HICON hIcon ) if ((hNew = alloc_icon_handle())) { ptrNew = get_icon_ptr( hNew ); - ptrNew->color = copy_bitmap( ptrOld->color ); - ptrNew->alpha = copy_bitmap( ptrOld->alpha ); - ptrNew->mask = copy_bitmap( ptrOld->mask ); ptrNew->is_icon = ptrOld->is_icon; ptrNew->width = ptrOld->width; ptrNew->height = ptrOld->height; ptrNew->hotspot = ptrOld->hotspot; + ptrNew->frame.mask = copy_bitmap( ptrOld->frame.mask ); + ptrNew->frame.color = copy_bitmap( ptrOld->frame.color ); + ptrNew->frame.alpha = copy_bitmap( ptrOld->frame.alpha ); release_icon_ptr( hNew, ptrNew ); } release_icon_ptr( hIcon, ptrOld ); @@ -1824,8 +1829,8 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) iconinfo->fIcon = ptr->is_icon; iconinfo->xHotspot = ptr->hotspot.x; iconinfo->yHotspot = ptr->hotspot.y; - iconinfo->hbmColor = copy_bitmap( ptr->color ); - iconinfo->hbmMask = copy_bitmap( ptr->mask ); + iconinfo->hbmColor = copy_bitmap( ptr->frame.color ); + iconinfo->hbmMask = copy_bitmap( ptr->frame.mask ); release_icon_ptr( hIcon, ptr ); return TRUE; @@ -1935,12 +1940,12 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) { struct cursoricon_object *info = get_icon_ptr( hObj ); - info->color = color; - info->mask = mask; - info->alpha = create_alpha_bitmap( iconinfo->hbmColor, mask, NULL, NULL ); info->is_icon = iconinfo->fIcon; info->width = width; info->height = height; + info->frame.color = color; + info->frame.mask = mask; + info->frame.alpha = create_alpha_bitmap( iconinfo->hbmColor, mask, NULL, NULL ); if (info->is_icon) { info->hotspot.x = width / 2; @@ -2053,7 +2058,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, oldFg = SetTextColor( hdc, RGB(0,0,0) ); oldBg = SetBkColor( hdc, RGB(255,255,255) ); - if (ptr->alpha && (flags & DI_IMAGE)) + if (ptr->frame.alpha && (flags & DI_IMAGE)) { BOOL is_mono = FALSE; @@ -2066,7 +2071,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (!is_mono) { BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; - SelectObject( hMemDC, ptr->alpha ); + SelectObject( hMemDC, ptr->frame.alpha ); if (GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, 0, ptr->width, ptr->height, pixelblend )) goto done; } @@ -2074,24 +2079,24 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (flags & DI_MASK) { - SelectObject( hMemDC, ptr->mask ); + SelectObject( hMemDC, ptr->frame.mask ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, 0, ptr->width, ptr->height, SRCAND ); } if (flags & DI_IMAGE) { - if (ptr->color) + if (ptr->frame.color) { DWORD rop = (flags & DI_MASK) ? SRCINVERT : SRCCOPY; - SelectObject( hMemDC, ptr->color ); + SelectObject( hMemDC, ptr->frame.color ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, 0, ptr->width, ptr->height, rop ); } else { DWORD rop = (flags & DI_MASK) ? SRCINVERT : SRCCOPY; - SelectObject( hMemDC, ptr->mask ); + SelectObject( hMemDC, ptr->frame.mask ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, ptr->height, ptr->width, ptr->height, rop ); }

1 0

Erich Hoover : winex11: Add support for animated cursors in X11 driver.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 9d13eb1b574a1d5c48b75952f2711a4ac3921fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d13eb1b574a1d5c48b75952f… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Oct 5 12:06:18 2010 -0600 winex11: Add support for animated cursors in X11 driver. (cherry picked from commit e84eb16c05559fea55f2219ea1a08e2efc0244ea) --- dlls/winex11.drv/mouse.c | 168 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 130 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index cf988c9..28b825d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -32,6 +32,9 @@ static void *xcursor_handle; MAKE_FUNCPTR(XcursorImageCreate); MAKE_FUNCPTR(XcursorImageDestroy); MAKE_FUNCPTR(XcursorImageLoadCursor); +MAKE_FUNCPTR(XcursorImagesCreate); +MAKE_FUNCPTR(XcursorImagesDestroy); +MAKE_FUNCPTR(XcursorImagesLoadCursor); # undef MAKE_FUNCPTR #endif /* SONAME_LIBXCURSOR */ @@ -114,6 +117,9 @@ void X11DRV_Xcursor_Init(void) LOAD_FUNCPTR(XcursorImageCreate); LOAD_FUNCPTR(XcursorImageDestroy); LOAD_FUNCPTR(XcursorImageLoadCursor); + LOAD_FUNCPTR(XcursorImagesCreate); + LOAD_FUNCPTR(XcursorImagesDestroy); + LOAD_FUNCPTR(XcursorImagesLoadCursor); #undef LOAD_FUNCPTR #endif /* SONAME_LIBXCURSOR */ } @@ -468,73 +474,159 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, #ifdef SONAME_LIBXCURSOR /*********************************************************************** - * create_xcursor_cursor + * create_xcursor_frame * - * Use Xcursor to create an X cursor from a Windows one. + * Use Xcursor to create a frame of an X cursor from a Windows one. */ -static Cursor create_xcursor_cursor( HDC hdc, ICONINFO *icon, int width, int height ) +static XcursorImage *create_xcursor_frame( HDC hdc, ICONINFO *iinfo, HANDLE icon, + HBITMAP hbmColor, unsigned char *color_bits, int color_size, + HBITMAP hbmMask, unsigned char *mask_bits, int mask_size, + int width, int height, int istep ) { + XcursorImage *image, *ret = NULL; int x, y, i, has_alpha; - BITMAPINFO *info; - Cursor cursor; - XcursorImage *image; XcursorPixel *ptr; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return 0; - wine_tsx11_lock(); image = pXcursorImageCreate( width, height ); wine_tsx11_unlock(); if (!image) { - HeapFree( GetProcessHeap(), 0, info ); - return 0; + ERR("X11 failed to produce a cursor frame!\n"); + goto cleanup; + } + + image->xhot = iinfo->xHotspot; + image->yhot = iinfo->yHotspot; + image->delay = 100; /* TODO: find a way to get the proper delay */ + + /* draw the cursor frame to a temporary buffer then copy it into the XcursorImage */ + memset( color_bits, 0x00, color_size ); + SelectObject( hdc, hbmColor ); + if (!DrawIconEx( hdc, 0, 0, icon, width, height, istep, NULL, DI_NORMAL )) + { + TRACE("Could not draw frame %d (walk past end of frames).\n", istep); + goto cleanup; + } + memcpy( image->pixels, color_bits, color_size ); + + /* check if the cursor frame was drawn with an alpha channel */ + for (i = 0, ptr = image->pixels; i < width * height; i++, ptr++) + if ((has_alpha = (*ptr & 0xff000000) != 0)) break; + + /* if no alpha channel was drawn then generate it from the mask */ + if (!has_alpha) + { + unsigned int width_bytes = (width + 31) / 32 * 4; + + /* draw the cursor mask to a temporary buffer */ + memset( mask_bits, 0xFF, mask_size ); + SelectObject( hdc, hbmMask ); + if (!DrawIconEx( hdc, 0, 0, icon, width, height, istep, NULL, DI_MASK )) + { + ERR("Failed to draw frame mask %d.\n", istep); + goto cleanup; + } + /* use the buffer to directly modify the XcursorImage alpha channel */ + for (y = 0, ptr = image->pixels; y < height; y++) + for (x = 0; x < width; x++, ptr++) + if (!((mask_bits[y * width_bytes + x / 8] << (x % 8)) & 0x80)) + *ptr |= 0xff000000; } + ret = image; + +cleanup: + if (ret == NULL) pXcursorImageDestroy( image ); + return ret; +} + +/*********************************************************************** + * create_xcursor_cursor + * + * Use Xcursor to create an X cursor from a Windows one. + */ +static Cursor create_xcursor_cursor( HDC hdc, ICONINFO *iinfo, HANDLE icon, int width, int height ) +{ + unsigned char *color_bits, *mask_bits; + HBITMAP hbmColor = 0, hbmMask = 0; + XcursorImage **imgs, *image; + int color_size, mask_size; + BITMAPINFO *info = NULL; + XcursorImages *images; + Cursor cursor = 0; + int nFrames = 0; - image->xhot = icon->xHotspot; - image->yhot = icon->yHotspot; - image->delay = 0; + if (!(imgs = HeapAlloc( GetProcessHeap(), 0, sizeof(XcursorImage*) ))) return 0; + /* Allocate all of the resources necessary to obtain a cursor frame */ + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto cleanup; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = width; info->bmiHeader.biHeight = -height; info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = 32; info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biSizeImage = width * height * 4; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - GetDIBits( hdc, icon->hbmColor, 0, height, image->pixels, info, DIB_RGB_COLORS ); - - for (i = 0, ptr = image->pixels; i < width * height; i++, ptr++) - if ((has_alpha = (*ptr & 0xff000000) != 0)) break; + info->bmiHeader.biBitCount = 32; + color_size = width * height * 4; + info->bmiHeader.biSizeImage = color_size; + hbmColor = CreateDIBSection( hdc, info, DIB_RGB_COLORS, (VOID **) &color_bits, NULL, 0); + if (!hbmColor) + { + ERR("Failed to create DIB section for cursor color data!\n"); + goto cleanup; + } + info->bmiHeader.biBitCount = 1; + mask_size = ((width + 31) / 32 * 4) * height; /* width_bytes * height */ + info->bmiHeader.biSizeImage = mask_size; + hbmMask = CreateDIBSection( hdc, info, DIB_RGB_COLORS, (VOID **) &mask_bits, NULL, 0); + if (!hbmMask) + { + ERR("Failed to create DIB section for cursor mask data!\n"); + goto cleanup; + } - if (!has_alpha) + /* Create an XcursorImage for each frame of the cursor */ + while (1) { - unsigned char *mask_bits; - unsigned int width_bytes = (width + 31) / 32 * 4; + XcursorImage **imgstmp; - /* generate alpha channel from the mask */ - info->bmiHeader.biBitCount = 1; - info->bmiHeader.biSizeImage = width_bytes * height; - if ((mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) - { - GetDIBits( hdc, icon->hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS ); - for (y = 0, ptr = image->pixels; y < height; y++) - for (x = 0; x < width; x++, ptr++) - if (!((mask_bits[y * width_bytes + x / 8] << (x % 8)) & 0x80)) - *ptr |= 0xff000000; - HeapFree( GetProcessHeap(), 0, mask_bits ); - } + image = create_xcursor_frame( hdc, iinfo, icon, + hbmColor, color_bits, color_size, + hbmMask, mask_bits, mask_size, + width, height, nFrames ); + if (!image) break; /* no more drawable frames */ + + imgs[nFrames++] = image; + if (!(imgstmp = HeapReAlloc( GetProcessHeap(), 0, imgs, (nFrames+1)*sizeof(XcursorImage*) ))) goto cleanup; + imgs = imgstmp; } - HeapFree( GetProcessHeap(), 0, info ); + /* Build an X cursor out of all of the frames */ + if (!(images = pXcursorImagesCreate( nFrames ))) goto cleanup; + for (images->nimage = 0; images->nimage < nFrames; images->nimage++) + images->images[images->nimage] = imgs[images->nimage]; wine_tsx11_lock(); - cursor = pXcursorImageLoadCursor( gdi_display, image ); - pXcursorImageDestroy( image ); + cursor = pXcursorImagesLoadCursor( gdi_display, images ); wine_tsx11_unlock(); + pXcursorImagesDestroy( images ); /* Note: this frees each individual frame (calls XcursorImageDestroy) */ + HeapFree( GetProcessHeap(), 0, imgs ); + imgs = NULL; + +cleanup: + if (imgs) + { + /* Failed to produce a cursor, free previously allocated frames */ + for (nFrames--; nFrames >= 0; nFrames--) + pXcursorImageDestroy( imgs[nFrames] ); + HeapFree( GetProcessHeap(), 0, imgs ); + } + /* Cleanup all of the resources used to obtain the frame data */ + if (hbmColor) DeleteObject( hbmColor ); + if (hbmMask) DeleteObject( hbmMask ); + HeapFree( GetProcessHeap(), 0, info ); return cursor; } @@ -772,7 +864,7 @@ static Cursor create_cursor( HANDLE handle ) if (info.hbmColor) { #ifdef SONAME_LIBXCURSOR - if (pXcursorImageLoadCursor) cursor = create_xcursor_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); + if (pXcursorImagesLoadCursor) cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); #endif if (!cursor) cursor = create_xlib_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); DeleteObject( info.hbmColor );

1 0

Alexandre Julliard : user32: Fix a DC leak in DrawIconEx.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 12c4533de370c8dfbac89d393652c4dee3f5a006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c4533de370c8dfbac89d393… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 21:51:37 2010 +0200 user32: Fix a DC leak in DrawIconEx. (cherry picked from commit bb8590f6ce0be06df712653c3222ba97efcbbd6d) --- dlls/user32/cursoricon.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 42bba6d..22464b7 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2042,18 +2042,18 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, hdc,x0,y0,hIcon,cxWidth,cyWidth,istep,hbr,flags ); if (!(ptr = get_icon_ptr( hIcon ))) return FALSE; - if (!(hMemDC = CreateCompatibleDC( hdc ))) + if (istep >= ptr->num_frames) { + TRACE_(icon)("Stepped past end of animated frames=%d\n", istep); release_icon_ptr( hIcon, ptr ); return FALSE; } - - if (istep >= ptr->num_frames) + if (!(hMemDC = CreateCompatibleDC( hdc ))) { - TRACE_(icon)("Stepped past end of animated frames=%d\n", istep); release_icon_ptr( hIcon, ptr ); return FALSE; } + if (flags & DI_NOMIRROR) FIXME_(icon)("Ignoring flag DI_NOMIRROR\n");

1 0

Dmitry Timoshkov : oleaut32: Handle VT_DATE in serialize_param()/ deserialize_param().
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 90ae8e6dc46c0a78c87406d1b20098c3e2bce3e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ae8e6dc46c0a78c87406d1b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 12 21:18:43 2010 +0900 oleaut32: Handle VT_DATE in serialize_param()/deserialize_param(). (cherry picked from commit 72da0a2d49d4c0856faa085e4e326d0382425e48) --- dlls/oleaut32/tmarshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 26babdb..bfe17c8 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -615,6 +615,7 @@ serialize_param( vartype = VT_SAFEARRAY; switch (vartype) { + case VT_DATE: case VT_I8: case VT_UI8: case VT_R8: @@ -911,6 +912,7 @@ deserialize_param( } return S_OK; } + case VT_DATE: case VT_I8: case VT_UI8: case VT_R8:

1 0