December 2010 - Wine-commits

Juan Lang : wininet: Don't make use of OpenSSL's security checks, as crypt32 also verifies certificate chain.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 9e7a96f5100e94034f7aa0866b9560ab397a95e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7a96f5100e94034f7aa0866… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 16:14:21 2010 -0700 wininet: Don't make use of OpenSSL's security checks, as crypt32 also verifies certificate chain. (cherry picked from commit 3e51313e37b2062dee2b4a5ee06b8d981728ff99) --- dlls/wininet/netconnection.c | 66 +++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 36 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index abd7415..07786d3 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -285,55 +285,49 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) SSL *ssl; WCHAR *server; BOOL ret = FALSE; + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); ssl = pX509_STORE_CTX_get_ex_data(ctx, pSSL_get_ex_data_X509_STORE_CTX_idx()); server = pSSL_get_ex_data(ssl, hostname_idx); - if (preverify_ok) + if (store) { - HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, - CERT_STORE_CREATE_NEW_FLAG, NULL); + X509 *cert; + int i; + PCCERT_CONTEXT endCert = NULL; - if (store) + ret = TRUE; + for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++) { - X509 *cert; - int i; - PCCERT_CONTEXT endCert = NULL; + PCCERT_CONTEXT context; - ret = TRUE; - for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++) + cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i); + if ((context = X509_to_cert_context(cert))) { - PCCERT_CONTEXT context; - - cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i); - if ((context = X509_to_cert_context(cert))) - { - if (i == 0) - ret = CertAddCertificateContextToStore(store, context, - CERT_STORE_ADD_ALWAYS, &endCert); - else - ret = CertAddCertificateContextToStore(store, context, - CERT_STORE_ADD_ALWAYS, NULL); - CertFreeCertificateContext(context); - } + if (i == 0) + ret = CertAddCertificateContextToStore(store, context, + CERT_STORE_ADD_ALWAYS, &endCert); + else + ret = CertAddCertificateContextToStore(store, context, + CERT_STORE_ADD_ALWAYS, NULL); + CertFreeCertificateContext(context); } - if (!endCert) ret = FALSE; - if (ret) - { - DWORD_PTR err = netconn_verify_cert(endCert, store, server); + } + if (!endCert) ret = FALSE; + if (ret) + { + DWORD_PTR err = netconn_verify_cert(endCert, store, server); - if (err) - { - pSSL_set_ex_data(ssl, error_idx, (void *)err); - ret = FALSE; - } + if (err) + { + pSSL_set_ex_data(ssl, error_idx, (void *)err); + ret = FALSE; } - CertFreeCertificateContext(endCert); - CertCloseStore(store, 0); } - } else - pSSL_set_ex_data(ssl, error_idx, (void *)ERROR_INTERNET_SEC_CERT_ERRORS); - + CertFreeCertificateContext(endCert); + CertCloseStore(store, 0); + } return ret; }

1 0

Juan Lang : wininet: Store WININET_NETCONNECTION * in SSL context.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: f59f6fd6b532348e72ae676f56479174b6401075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59f6fd6b532348e72ae676f5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 16:33:19 2010 -0700 wininet: Store WININET_NETCONNECTION * in SSL context. (cherry picked from commit ce0164c3f784e1768b74296b7a19c92d030a8723) --- dlls/wininet/netconnection.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 07786d3..12aef21 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -117,6 +117,7 @@ static SSL_METHOD *meth; static SSL_CTX *ctx; static int hostname_idx; static int error_idx; +static int conn_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -454,6 +455,15 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) LeaveCriticalSection(&init_ssl_cs); return ERROR_OUTOFMEMORY; } + conn_idx = pSSL_get_ex_new_index(0, (void *)"netconn index", + NULL, NULL, NULL); + if (conn_idx == -1) + { + ERR("SSL_get_ex_new_index failed; %s\n", + pERR_error_string(pERR_get_error(), 0)); + LeaveCriticalSection(&init_ssl_cs); + return ERROR_OUTOFMEMORY; + } pSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, netconn_secure_verify); pCRYPTO_set_id_callback(ssl_thread_id); @@ -665,7 +675,20 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) ERR("SSL_connect failed: %d\n", res); goto fail; } - pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname); + if (!pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname)) + { + ERR("SSL_set_ex_data failed: %s\n", + pERR_error_string(pERR_get_error(), 0)); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + goto fail; + } + if (!pSSL_set_ex_data(connection->ssl_s, conn_idx, connection)) + { + ERR("SSL_set_ex_data failed: %s\n", + pERR_error_string(pERR_get_error(), 0)); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + goto fail; + } cert = pSSL_get_peer_certificate(connection->ssl_s); if (!cert) {

1 0

Juan Lang : wininet: Store security flags in WININET_NETCONNECTION.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: d9d8afb7d9433b4f349c2d8d29cf9e181ca448d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d8afb7d9433b4f349c2d8d2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 16:46:41 2010 -0700 wininet: Store security flags in WININET_NETCONNECTION. (cherry picked from commit 77c4ade08bbd6a76d59c2c6e45a4585470909539) --- dlls/wininet/http.c | 11 +++++++++++ dlls/wininet/internet.h | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 54895bb..7ed60e9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1762,6 +1762,17 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, http_request_t *req = (http_request_t*)hdr; switch(option) { + case INTERNET_OPTION_SECURITY_FLAGS: + { + DWORD flags; + + if (!buffer || size != sizeof(DWORD)) + return ERROR_INVALID_PARAMETER; + flags = *(DWORD *)buffer; + TRACE("%08x\n", flags); + req->netConnection.security_flags = flags; + return ERROR_SUCCESS; + } case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: TRACE("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n"); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 07b92d8..6327f7a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -53,6 +53,7 @@ typedef struct BOOL useSSL; int socketFD; void *ssl_s; + DWORD security_flags; } WININET_NETCONNECTION; static inline LPWSTR heap_strdupW(LPCWSTR str)

1 0

Juan Lang : wininet: Don't retrieve a certificate that isn't used.
by Alexandre Julliard 02 Dec '10

02 Dec '10

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 02 Dec '10

02 Dec '10

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 02 Dec '10

02 Dec '10

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

Michael Stefaniuc : user32: Simplify the error handling in BITMAP_Load().
by Alexandre Julliard 02 Dec '10

02 Dec '10

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 02 Dec '10

02 Dec '10

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 : user32: Add support for multiple frames in cursor format.
by Alexandre Julliard 02 Dec '10

02 Dec '10

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

Alexandre Julliard : user32: Fix a DC leak in DrawIconEx.
by Alexandre Julliard 02 Dec '10

02 Dec '10

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