June 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Try to use the correct window rectangle as far as possible at XCreateWindow time .
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: edebc2b75f59b5d0f63e300084eba6fbca814bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=edebc2b75f59b5d0f63e30008… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 12:10:44 2009 +0200 winex11: Try to use the correct window rectangle as far as possible at XCreateWindow time. --- dlls/winex11.drv/window.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 56f99cb..9970348 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1443,11 +1443,6 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat BYTE alpha; DWORD layered_flags; - if (!(cx = data->window_rect.right - data->window_rect.left)) cx = 1; - else if (cx > 65535) cx = 65535; - if (!(cy = data->window_rect.bottom - data->window_rect.top)) cy = 1; - else if (cy > 65535) cy = 65535; - if (!data->managed && is_window_managed( data->hwnd, SWP_NOACTIVATE, &data->window_rect )) { TRACE( "making win %p/%lx managed\n", data->hwnd, data->whole_window ); @@ -1457,12 +1452,17 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat mask = get_window_attributes( display, data, &attr ); - wine_tsx11_lock(); - data->whole_rect = data->window_rect; + X11DRV_window_to_X_rect( data, &data->whole_rect ); + if (!(cx = data->whole_rect.right - data->whole_rect.left)) cx = 1; + else if (cx > 65535) cx = 65535; + if (!(cy = data->whole_rect.bottom - data->whole_rect.top)) cy = 1; + else if (cy > 65535) cy = 65535; + + wine_tsx11_lock(); data->whole_window = XCreateWindow( display, root_window, - data->window_rect.left - virtual_screen_rect.left, - data->window_rect.top - virtual_screen_rect.top, + data->whole_rect.left - virtual_screen_rect.left, + data->whole_rect.top - virtual_screen_rect.top, cx, cy, 0, screen_depth, InputOutput, visual, mask, &attr );

1 0

Alexandre Julliard : ntdll: Compute the free lists address at run-time instead of playing with alignment and padding .
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 476324e8ba441a4f364787c7a8b0037f1687dca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=476324e8ba441a4f364787c7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 14:33:15 2009 +0200 ntdll: Compute the free lists address at run-time instead of playing with alignment and padding. --- dlls/ntdll/heap.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2d7d53d..638cb3e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -91,6 +91,8 @@ typedef struct #define LARGE_ALIGNMENT 16 /* large blocks have stricter alignment */ #define ARENA_OFFSET (ALIGNMENT - sizeof(ARENA_INUSE)) +C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); + #define ROUND_SIZE(size) ((((size) + ALIGNMENT - 1) & ~(ALIGNMENT-1)) + ARENA_OFFSET) #define QUIET 1 /* Suppress messages */ @@ -144,7 +146,7 @@ typedef struct tagHEAP SIZE_T grow_size; /* Size of next subheap for growing heap */ DWORD magic; /* Magic number */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ - FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS] DECLSPEC_ALIGN(8); /* Free lists */ + FREE_LIST_ENTRY *freeList; /* Free lists */ } HEAP; #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) @@ -824,6 +826,8 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* Build the free lists */ + heap->freeList = (FREE_LIST_ENTRY *)((char *)heap + subheap->headerSize); + subheap->headerSize += HEAP_NB_FREE_LISTS * sizeof(FREE_LIST_ENTRY); list_init( &heap->freeList[0].arena.entry ); for (i = 0, pEntry = heap->freeList; i < HEAP_NB_FREE_LISTS; i++, pEntry++) { @@ -1261,9 +1265,6 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c { processHeap = subheap->heap; /* assume the first heap we create is the process main heap */ list_init( &processHeap->entry ); - /* make sure structure alignment is correct */ - assert( (ULONG_PTR)processHeap->freeList % ALIGNMENT == ARENA_OFFSET ); - assert( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); } return subheap->heap;

1 0

Alexandre Julliard : ntdll: Don' t try to decommit a heap past its initial commit size.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: c68594a9417c98b2a3a8056b9ef8512822673cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68594a9417c98b2a3a8056b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 12:11:14 2009 +0200 ntdll: Don't try to decommit a heap past its initial commit size. --- dlls/ntdll/heap.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 638cb3e..5466a54 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -125,6 +125,7 @@ typedef struct tagSUBHEAP { void *base; /* Base address of the sub-heap memory block */ SIZE_T size; /* Size of the whole sub-heap */ + SIZE_T min_commit; /* Minimum committed size */ SIZE_T commitSize; /* Committed size of the sub-heap */ struct list entry; /* Entry in sub-heap list */ struct tagHEAP *heap; /* Main heap structure */ @@ -490,6 +491,7 @@ static inline BOOL HEAP_Decommit( SUBHEAP *subheap, void *ptr ) /* round to next block and add one full block */ size = ((size + COMMIT_MASK) & ~COMMIT_MASK) + COMMIT_MASK + 1; + size = max( size, subheap->min_commit ); if (size >= subheap->commitSize) return TRUE; decommit_size = subheap->commitSize - size; addr = (char *)subheap->base + size; @@ -799,6 +801,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, subheap->base = address; subheap->heap = heap; subheap->size = totalSize; + subheap->min_commit = 0x10000; subheap->commitSize = commitSize; subheap->magic = SUBHEAP_MAGIC; subheap->headerSize = ROUND_SIZE( sizeof(SUBHEAP) ); @@ -819,6 +822,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, subheap->base = address; subheap->heap = heap; subheap->size = totalSize; + subheap->min_commit = commitSize; subheap->commitSize = commitSize; subheap->magic = SUBHEAP_MAGIC; subheap->headerSize = ROUND_SIZE( sizeof(HEAP) );

1 0

Alexandre Julliard : ntdll: Release some address space after the process initialization is done.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 09712593c8496be5e952b7316099f9eed5043203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09712593c8496be5e952b7316… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 14:18:53 2009 +0200 ntdll: Release some address space after the process initialization is done. --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/virtual.c | 79 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 76 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2f9b41e..aa9395e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2477,11 +2477,11 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error; if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error; - if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; + virtual_release_address_space( nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE ); virtual_clear_thread_stack(); return; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 34ae2d6..b6a3d88 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -150,7 +150,7 @@ extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ); extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ); extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ); extern void VIRTUAL_SetForceExec( BOOL enable ); -extern void VIRTUAL_UseLargeAddressSpace(void); +extern void virtual_release_address_space( BOOL free_high_mem ); extern struct _KUSER_SHARED_DATA *user_shared_data; /* completion */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 33918ca..bacfa32 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -370,6 +370,36 @@ static void add_reserved_area( void *addr, size_t size ) /*********************************************************************** + * remove_reserved_area + * + * Remove a reserved area from the list maintained by libwine. + * The csVirtual section must be held by caller. + */ +static void remove_reserved_area( void *addr, size_t size ) +{ + struct file_view *view; + + TRACE( "removing %p-%p\n", addr, (char *)addr + size ); + wine_mmap_remove_reserved_area( addr, size, 0 ); + + /* unmap areas not covered by an existing view */ + LIST_FOR_EACH_ENTRY( view, &views_list, struct file_view, entry ) + { + if ((char *)view->base >= (char *)addr + size) + { + munmap( addr, size ); + break; + } + if ((char *)view->base + view->size <= (char *)addr) continue; + if (view->base > addr) munmap( addr, (char *)view->base - (char *)addr ); + if ((char *)view->base + view->size > (char *)addr + size) break; + size = (char *)addr + size - ((char *)view->base + view->size); + addr = (char *)view->base + view->size; + } +} + + +/*********************************************************************** * is_beyond_limit * * Check if an address range goes beyond a given limit. @@ -1615,17 +1645,56 @@ void VIRTUAL_SetForceExec( BOOL enable ) server_leave_uninterrupted_section( &csVirtual, &sigset ); } +struct free_range +{ + char *base; + char *limit; +}; + +/* free reserved areas above the limit; callback for wine_mmap_enum_reserved_areas */ +static int free_reserved_memory( void *base, size_t size, void *arg ) +{ + struct free_range *range = arg; + + if ((char *)base >= range->limit) return 0; + if ((char *)base + size <= range->base) return 0; + if ((char *)base < range->base) + { + size -= range->base - (char *)base; + base = range->base; + } + if ((char *)base + size > range->limit) size = range->limit - (char *)base; + remove_reserved_area( base, size ); + return 1; /* stop enumeration since the list has changed */ +} /*********************************************************************** - * VIRTUAL_UseLargeAddressSpace + * virtual_release_address_space * - * Increase the address space size for apps that support it. + * Release some address space once we have loaded and initialized the app. */ -void VIRTUAL_UseLargeAddressSpace(void) +void virtual_release_address_space( BOOL free_high_mem ) { +#ifdef __i386__ + struct free_range range; + sigset_t sigset; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + + range.base = (char *)0x20000000; + range.limit = (char *)0x7f000000; + while (wine_mmap_enum_reserved_areas( free_reserved_memory, &range, 0 )) /* nothing */; + /* no large address space on win9x */ - if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; - user_space_limit = working_set_limit = address_space_limit; + if (free_high_mem && NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT) + { + range.base = (char *)0x80000000; + range.limit = address_space_limit; + while (wine_mmap_enum_reserved_areas( free_reserved_memory, &range, 1 )) /* nothing */; + user_space_limit = working_set_limit = address_space_limit; + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); +#endif }

1 0

Alexandre Julliard : loader: Reserve some more memory to cover the native ole32 addresses.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 8d833ee2e7a1d8b82e2dccf51e0cbc20742a0833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d833ee2e7a1d8b82e2dccf51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 14:19:09 2009 +0200 loader: Reserve some more memory to cover the native ole32 addresses. --- loader/main.c | 4 ++-- loader/preloader.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/main.c b/loader/main.c index 0ead6d4..676eae3 100644 --- a/loader/main.c +++ b/loader/main.c @@ -40,9 +40,9 @@ #ifdef __APPLE__ -asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x60000000"); +asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x70000000"); asm(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000"); -extern char __wine_dos[0x60000000], __wine_shared_heap[0x03000000]; +extern char __wine_dos[0x70000000], __wine_shared_heap[0x03000000]; static const struct wine_preload_info wine_main_preload_info[] = { diff --git a/loader/preloader.c b/loader/preloader.c index 1143972..e7ac0c1 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -110,7 +110,7 @@ static struct wine_preload_info preload_info[] = { { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ - { (void *)0x00110000, 0x5fef0000 }, /* low memory area */ + { (void *)0x00110000, 0x6fef0000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

Joel Holdsworth : user32: Added DrawIcon alpha blending support.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: a0232508b3ae56caabdc9265aacc516b943e183e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0232508b3ae56caabdc9265a… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 31 17:00:17 2009 +0100 user32: Added DrawIcon alpha blending support. --- dlls/user32/cursoricon.c | 131 ++++++++++++++++++++++++++++++++++++---- dlls/user32/tests/cursoricon.c | 20 +++---- 2 files changed, 128 insertions(+), 23 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 707d2bb..7f56648 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1598,6 +1598,74 @@ BOOL WINAPI DestroyCursor( HCURSOR hCursor ) return DestroyIcon32(HCURSOR_16(hCursor), CID_WIN32); } +/*********************************************************************** + * bitmap_has_alpha_channel + * + * Analyses bits bitmap to determine if alpha data is present. + * + * PARAMS + * bpp [I] The bits-per-pixel of the bitmap + * bitmapBits [I] A pointer to the bitmap data + * bitmapLength [I] The length of the bitmap in bytes + * + * RETURNS + * TRUE if an alpha channel is discovered, FALSE + * + * NOTE + * Windows' behaviour is that if the icon bitmap is 32-bit and at + * least one pixel has a non-zero alpha, then the bitmap is a + * treated as having an alpha channel transparentcy. Otherwise, + * it's treated as being completely opaque. + * + */ +static BOOL bitmap_has_alpha_channel( int bpp, unsigned char *bitmapBits, + unsigned int bitmapLength ) +{ + /* Detect an alpha channel by looking for non-zero alpha pixels */ + if(bpp == 32) + { + unsigned int offset; + for(offset = 3; offset < bitmapLength; offset += 4) + { + if(bitmapBits[offset] != 0) + { + return TRUE; + break; + } + } + } + return FALSE; +} + +/*********************************************************************** + * premultiply_alpha_channel + * + * Premultiplies the color channels of a 32-bit bitmap by the alpha + * channel. This is a necessary step that must be carried out on + * the image before it is passed to GdiAlphaBlend + * + * PARAMS + * destBitmap [I] The destination bitmap buffer + * srcBitmap [I] The source bitmap buffer + * bitmapLength [I] The length of the bitmap in bytes + * + */ +static void premultiply_alpha_channel( unsigned char *destBitmap, + unsigned char *srcBitmap, + unsigned int bitmapLength ) +{ + unsigned char *destPixel = destBitmap; + unsigned char *srcPixel = srcBitmap; + + while(destPixel < destBitmap + bitmapLength) + { + unsigned char alpha = srcPixel[3]; + *(destPixel++) = *(srcPixel++) * alpha / 255; + *(destPixel++) = *(srcPixel++) * alpha / 255; + *(destPixel++) = *(srcPixel++) * alpha / 255; + *(destPixel++) = *(srcPixel++); + } +} /*********************************************************************** * DrawIcon (USER32.@) @@ -1606,28 +1674,69 @@ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon ) { CURSORICONINFO *ptr; HDC hMemDC; - HBITMAP hXorBits, hAndBits; + HBITMAP hXorBits = NULL, hAndBits = NULL, hBitTemp = NULL; COLORREF oldFg, oldBg; + unsigned char *xorBitmapBits; + unsigned int dibLength; TRACE("%p, (%d,%d), %p\n", hdc, x, y, hIcon); if (!(ptr = GlobalLock16(HICON_16(hIcon)))) return FALSE; if (!(hMemDC = CreateCompatibleDC( hdc ))) return FALSE; - hAndBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); - hXorBits = CreateBitmap( ptr->nWidth, ptr->nHeight, ptr->bPlanes, - ptr->bBitsPerPixel, (char *)(ptr + 1) - + ptr->nHeight * get_bitmap_width_bytes(ptr->nWidth,1) ); + + dibLength = ptr->nHeight * get_bitmap_width_bytes( + ptr->nWidth, ptr->bBitsPerPixel); + + xorBitmapBits = (unsigned char *)(ptr + 1) + ptr->nHeight * + get_bitmap_width_bytes(ptr->nWidth, 1); + oldFg = SetTextColor( hdc, RGB(0,0,0) ); oldBg = SetBkColor( hdc, RGB(255,255,255) ); - if (hXorBits && hAndBits) + if(bitmap_has_alpha_channel(ptr->bBitsPerPixel, xorBitmapBits, dibLength)) + { + BITMAPINFOHEADER bmih; + unsigned char *dibBits; + + memset(&bmih, 0, sizeof(BITMAPINFOHEADER)); + bmih.biSize = sizeof(BITMAPINFOHEADER); + bmih.biWidth = ptr->nWidth; + bmih.biHeight = -ptr->nHeight; + bmih.biPlanes = ptr->bPlanes; + bmih.biBitCount = 32; + bmih.biCompression = BI_RGB; + + hXorBits = CreateDIBSection(hdc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, + (void*)&dibBits, NULL, 0); + + if (hXorBits && dibBits) + { + BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + + /* Do the alpha blending render */ + premultiply_alpha_channel(dibBits, xorBitmapBits, dibLength); + hBitTemp = SelectObject( hMemDC, hXorBits ); + GdiAlphaBlend(hdc, x, y, ptr->nWidth, ptr->nHeight, hMemDC, + 0, 0, ptr->nWidth, ptr->nHeight, pixelblend); + SelectObject( hMemDC, hBitTemp ); + } + } + else { - HBITMAP hBitTemp = SelectObject( hMemDC, hAndBits ); - BitBlt( hdc, x, y, ptr->nWidth, ptr->nHeight, hMemDC, 0, 0, SRCAND ); - SelectObject( hMemDC, hXorBits ); - BitBlt(hdc, x, y, ptr->nWidth, ptr->nHeight, hMemDC, 0, 0,SRCINVERT); - SelectObject( hMemDC, hBitTemp ); + hAndBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); + hXorBits = CreateBitmap( ptr->nWidth, ptr->nHeight, ptr->bPlanes, + ptr->bBitsPerPixel, xorBitmapBits); + + if (hXorBits && hAndBits) + { + hBitTemp = SelectObject( hMemDC, hAndBits ); + BitBlt( hdc, x, y, ptr->nWidth, ptr->nHeight, hMemDC, 0, 0, SRCAND ); + SelectObject( hMemDC, hXorBits ); + BitBlt(hdc, x, y, ptr->nWidth, ptr->nHeight, hMemDC, 0, 0,SRCINVERT); + SelectObject( hMemDC, hBitTemp ); + } } + DeleteDC( hMemDC ); if (hXorBits) DeleteObject( hXorBits ); if (hAndBits) DeleteObject( hAndBits ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 3b646fb..71bf104 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1090,26 +1090,22 @@ static void test_DrawIcon(void) /* Test alpha blending */ /* Windows 2000 and up will alpha blend, earlier Windows versions will not */ check_DrawIcon(hdcDst, FALSE, 0xFFA0B0C0, 32, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + check_DrawIcon(hdcDst, TRUE, 0xFFA0B0C0, 32, 0x00FFFFFF, 0x00C0B0A0, 0x003F4F5F, __LINE__); - todo_wine - { - check_DrawIcon(hdcDst, TRUE, 0xFFA0B0C0, 32, 0x00FFFFFF, 0x00C0B0A0, 0x003F4F5F, __LINE__); + check_DrawIcon(hdcDst, FALSE, 0x80A0B0C0, 32, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); + check_DrawIcon(hdcDst, TRUE, 0x80A0B0C0, 32, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); + check_DrawIcon(hdcDst, FALSE, 0x80A0B0C0, 32, 0x00FFFFFF, 0x00DFD7CF, 0x00C0B0A0, __LINE__); + check_DrawIcon(hdcDst, TRUE, 0x80A0B0C0, 32, 0x00FFFFFF, 0x00DFD7CF, 0x003F4F5F, __LINE__); - check_DrawIcon(hdcDst, FALSE, 0x80A0B0C0, 32, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); - check_DrawIcon(hdcDst, TRUE, 0x80A0B0C0, 32, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); - check_DrawIcon(hdcDst, FALSE, 0x80A0B0C0, 32, 0x00FFFFFF, 0x00DFD7CF, 0x00C0B0A0, __LINE__); - check_DrawIcon(hdcDst, TRUE, 0x80A0B0C0, 32, 0x00FFFFFF, 0x00DFD7CF, 0x003F4F5F, __LINE__); - - check_DrawIcon(hdcDst, FALSE, 0x01FFFFFF, 32, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); - check_DrawIcon(hdcDst, TRUE, 0x01FFFFFF, 32, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); - } + check_DrawIcon(hdcDst, FALSE, 0x01FFFFFF, 32, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); + check_DrawIcon(hdcDst, TRUE, 0x01FFFFFF, 32, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); /* Test detecting of alpha channel */ /* If a single pixel's alpha channel is non-zero, the icon will be alpha blended, otherwise it will be draw with and + xor blts. */ check_alpha_draw(hdcDst, FALSE, FALSE, 32, __LINE__); - todo_wine check_alpha_draw(hdcDst, FALSE, TRUE, 32, __LINE__); + check_alpha_draw(hdcDst, FALSE, TRUE, 32, __LINE__); cleanup: if(bmpOld)

1 0

Joel Holdsworth : user32: Added DrawIconEx alpha blending support.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: d1c89d0a78e27f82debe9d7a2de185ae13b6e481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c89d0a78e27f82debe9d7a2… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 31 16:52:48 2009 +0100 user32: Added DrawIconEx alpha blending support. --- dlls/user32/cursoricon.c | 102 +++++++++++++++++++++++++++++----------- dlls/user32/tests/cursoricon.c | 26 ++++------ 2 files changed, 85 insertions(+), 43 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7f56648..92446e1 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2273,25 +2273,33 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, INT cxWidth, INT cyWidth, UINT istep, HBRUSH hbr, UINT flags ) { - CURSORICONINFO *ptr = GlobalLock16(HICON_16(hIcon)); + CURSORICONINFO *ptr; HDC hDC_off = 0, hMemDC; BOOL result = FALSE, DoOffscreen; HBITMAP hB_off = 0, hOld = 0; + unsigned char *xorBitmapBits; + unsigned int xorLength; + BOOL has_alpha = FALSE; - if (!ptr) return FALSE; TRACE_(icon)("(hdc=%p,pos=%d.%d,hicon=%p,extend=%d.%d,istep=%d,br=%p,flags=0x%08x)\n", hdc,x0,y0,hIcon,cxWidth,cyWidth,istep,hbr,flags ); - hMemDC = CreateCompatibleDC (hdc); + if (!(ptr = GlobalLock16(HICON_16(hIcon)))) return FALSE; + if (!(hMemDC = CreateCompatibleDC( hdc ))) return FALSE; + if (istep) FIXME_(icon)("Ignoring istep=%d\n", istep); if (flags & DI_NOMIRROR) FIXME_(icon)("Ignoring flag DI_NOMIRROR\n"); - if (!flags) { - FIXME_(icon)("no flags set? setting to DI_NORMAL\n"); - flags = DI_NORMAL; - } + xorLength = ptr->nHeight * get_bitmap_width_bytes( + ptr->nWidth, ptr->bBitsPerPixel); + xorBitmapBits = (unsigned char *)(ptr + 1) + ptr->nHeight * + get_bitmap_width_bytes(ptr->nWidth, 1); + + if (flags & DI_IMAGE) + has_alpha = bitmap_has_alpha_channel( + ptr->bBitsPerPixel, xorBitmapBits, xorLength); /* Calculate the size of the destination image. */ if (cxWidth == 0) @@ -2329,50 +2337,90 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (hMemDC && (!DoOffscreen || (hDC_off && hB_off))) { - HBITMAP hXorBits, hAndBits; + HBITMAP hBitTemp; + HBITMAP hXorBits = NULL, hAndBits = NULL; COLORREF oldFg, oldBg; INT nStretchMode; nStretchMode = SetStretchBltMode (hdc, STRETCH_DELETESCANS); - hXorBits = CreateBitmap ( ptr->nWidth, ptr->nHeight, - ptr->bPlanes, ptr->bBitsPerPixel, - (char *)(ptr + 1) - + ptr->nHeight * - get_bitmap_width_bytes(ptr->nWidth,1) ); - hAndBits = CreateBitmap ( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); oldFg = SetTextColor( hdc, RGB(0,0,0) ); oldBg = SetBkColor( hdc, RGB(255,255,255) ); - if (hXorBits && hAndBits) + if (((flags & DI_MASK) && !(flags & DI_IMAGE)) || + ((flags & DI_MASK) && !has_alpha)) { - HBITMAP hBitTemp = SelectObject( hMemDC, hAndBits ); - if (flags & DI_MASK) + hAndBits = CreateBitmap ( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); + if (hAndBits) { + hBitTemp = SelectObject( hMemDC, hAndBits ); if (DoOffscreen) StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth, hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCAND); else StretchBlt (hdc, x0, y0, cxWidth, cyWidth, hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCAND); + SelectObject( hMemDC, hBitTemp ); } - SelectObject( hMemDC, hXorBits ); - if (flags & DI_IMAGE) + } + + if (flags & DI_IMAGE) + { + BITMAPINFOHEADER bmih; + unsigned char *dibBits; + + memset(&bmih, 0, sizeof(BITMAPINFOHEADER)); + bmih.biSize = sizeof(BITMAPINFOHEADER); + bmih.biWidth = ptr->nWidth; + bmih.biHeight = -ptr->nHeight; + bmih.biPlanes = ptr->bPlanes; + bmih.biBitCount = ptr->bBitsPerPixel; + bmih.biCompression = BI_RGB; + + hXorBits = CreateDIBSection(hdc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, + (void*)&dibBits, NULL, 0); + + if (hXorBits && dibBits) { - if (DoOffscreen) - StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth, - hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT); + if(has_alpha) + { + BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + + /* Do the alpha blending render */ + premultiply_alpha_channel(dibBits, xorBitmapBits, xorLength); + hBitTemp = SelectObject( hMemDC, hXorBits ); + + if (DoOffscreen) + GdiAlphaBlend(hDC_off, 0, 0, cxWidth, cyWidth, hMemDC, + 0, 0, ptr->nWidth, ptr->nHeight, pixelblend); + else + GdiAlphaBlend(hdc, x0, y0, cxWidth, cyWidth, hMemDC, + 0, 0, ptr->nWidth, ptr->nHeight, pixelblend); + + SelectObject( hMemDC, hBitTemp ); + } else - StretchBlt (hdc, x0, y0, cxWidth, cyWidth, - hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT); + { + memcpy(dibBits, xorBitmapBits, xorLength); + hBitTemp = SelectObject( hMemDC, hXorBits ); + if (DoOffscreen) + StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth, + hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT); + else + StretchBlt (hdc, x0, y0, cxWidth, cyWidth, + hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT); + SelectObject( hMemDC, hBitTemp ); + } + + DeleteObject( hXorBits ); } - SelectObject( hMemDC, hBitTemp ); - result = TRUE; } + result = TRUE; + SetTextColor( hdc, oldFg ); SetBkColor( hdc, oldBg ); - if (hXorBits) DeleteObject( hXorBits ); + if (hAndBits) DeleteObject( hAndBits ); SetStretchBltMode (hdc, nStretchMode); if (DoOffscreen) { diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 71bf104..3f8bd82 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1167,11 +1167,8 @@ static void test_DrawIconEx(void) bmpOld = SelectObject(hdcDst, bmpDst); /* Test null, image only, and mask only drawing */ - todo_wine - { - check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, 0, 0x00102030, 0x00102030, 0x00102030, __LINE__); - check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, 0, 0x00102030, 0x00102030, 0x00102030, __LINE__); - } + check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, 0, 0x00102030, 0x00102030, 0x00102030, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, 0, 0x00102030, 0x00102030, 0x00102030, __LINE__); check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00000000, 0x00000000, __LINE__); check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF, __LINE__); @@ -1189,25 +1186,22 @@ static void test_DrawIconEx(void) /* Test alpha blending */ /* Windows 2000 and up will alpha blend, earlier Windows versions will not */ - todo_wine check_DrawIconEx(hdcDst, TRUE, 0xFFA0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x003F4F5F, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0xFFA0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x003F4F5F, __LINE__); - todo_wine - { - check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_NORMAL, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); - check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_NORMAL, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); - check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00DFD7CF, 0x00C0B0A0, __LINE__); - check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00DFD7CF, 0x003F4F5F, __LINE__); + check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_NORMAL, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_NORMAL, 0x00000000, 0x00605850, 0x00C0B0A0, __LINE__); + check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00DFD7CF, 0x00C0B0A0, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00DFD7CF, 0x003F4F5F, __LINE__); - check_DrawIconEx(hdcDst, FALSE, 0x01FFFFFF, 32, DI_NORMAL, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); - check_DrawIconEx(hdcDst, TRUE, 0x01FFFFFF, 32, DI_NORMAL, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); - } + check_DrawIconEx(hdcDst, FALSE, 0x01FFFFFF, 32, DI_NORMAL, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x01FFFFFF, 32, DI_NORMAL, 0x00000000, 0x00010101, 0x00FFFFFF, __LINE__); /* Test detecting of alpha channel */ /* If a single pixel's alpha channel is non-zero, the icon will be alpha blended, otherwise it will be draw with and + xor blts. */ check_alpha_draw(hdcDst, TRUE, FALSE, 32, __LINE__); - todo_wine check_alpha_draw(hdcDst, TRUE, TRUE, 32, __LINE__); + check_alpha_draw(hdcDst, TRUE, TRUE, 32, __LINE__); cleanup: if(bmpOld)

1 0

Eric van Beurden : wininet: Add a terminating empty line to the headers if necessary.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 42c7dc94e2e45e9ed86e586dedb663d8e61b8275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c7dc94e2e45e9ed86e586de… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Wed Jun 24 13:28:00 2009 -0400 wininet: Add a terminating empty line to the headers if necessary. --- dlls/wininet/http.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3cdc8a6..f1a6ce7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4337,6 +4337,19 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) } }while(1); + /* make sure the response header is terminated with an empty line. Some apps really + truly care about that empty line being there for some reason. Just add it to the + header. */ + if (cchRawHeaders + strlenW(szCrLf) > cchMaxRawHeaders) + { + cchMaxRawHeaders = cchRawHeaders + strlenW(szCrLf); + temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders + 1) * sizeof(WCHAR)); + if (temp == NULL) goto lend; + lpszRawHeaders = temp; + } + + memcpy(&lpszRawHeaders[cchRawHeaders], szCrLf, sizeof(szCrLf)); + HeapFree(GetProcessHeap(), 0, lpwhr->lpszRawHeaders); lpwhr->lpszRawHeaders = lpszRawHeaders; TRACE("raw headers: %s\n", debugstr_w(lpszRawHeaders));

1 0

Eric van Beurden : wininet: Check for failed heap allocations.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: f0ce72082d90dfeef4c1b8dc3144908c341b6856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ce72082d90dfeef4c1b8dc3… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Wed Jun 24 13:31:34 2009 -0400 wininet: Check for failed heap allocations. --- dlls/wininet/cookie.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index dc77b17..c9bcad0 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -453,6 +453,12 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST BOOL expired = FALSE; value = data = HeapAlloc(GetProcessHeap(), 0, (strlenW(cookie_data) + 1) * sizeof(WCHAR)); + if (data == NULL) + { + ERR("could not allocate %zu bytes for the cookie data buffer\n", (strlenW(cookie_data) + 1) * sizeof(WCHAR)); + return FALSE; + } + strcpyW(data,cookie_data); memset(&expiry,0,sizeof(expiry)); @@ -470,7 +476,15 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST if (!(ptr = strchrW(ptr,';'))) break; *ptr++ = 0; + if (value != data) + HeapFree(GetProcessHeap(), 0, value); value = HeapAlloc(GetProcessHeap(), 0, (ptr - data) * sizeof(WCHAR)); + if (value == NULL) + { + HeapFree(GetProcessHeap(), 0, data); + ERR("could not allocate %zu bytes for the cookie value buffer\n", (ptr - data) * sizeof(WCHAR)); + return FALSE; + } strcpyW(value, data); while (*ptr == ' ') ptr++; /* whitespace */

1 0

Huw Davies : configure: Remove reference to obsolete ftnames.h.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 08453c1f2bbb4c74d6643fc8df7c040e2c765147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08453c1f2bbb4c74d6643fc8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 24 15:41:04 2009 +0100 configure: Remove reference to obsolete ftnames.h. --- configure | 2 -- configure.ac | 1 - dlls/gdi32/freetype.c | 4 ---- dlls/wineps.drv/truetype.c | 4 ---- include/config.h.in | 3 --- 5 files changed, 0 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 3f3548e..ebf519f 100755 --- a/configure +++ b/configure @@ -14601,13 +14601,11 @@ fi - for ac_header in ft2build.h \ freetype/freetype.h \ freetype/ftglyph.h \ freetype/fttypes.h \ freetype/tttables.h \ - freetype/ftnames.h \ freetype/ftsnames.h \ freetype/ttnameid.h \ freetype/ftoutln.h \ diff --git a/configure.ac b/configure.ac index bb4d82e..8ce3686 100644 --- a/configure.ac +++ b/configure.ac @@ -1169,7 +1169,6 @@ then freetype/ftglyph.h \ freetype/fttypes.h \ freetype/tttables.h \ - freetype/ftnames.h \ freetype/ftsnames.h \ freetype/ttnameid.h \ freetype/ftoutln.h \ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ef93402..6500601 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -109,10 +109,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #endif #ifdef HAVE_FREETYPE_FTSNAMES_H #include <freetype/ftsnames.h> -#else -# ifdef HAVE_FREETYPE_FTNAMES_H -# include <freetype/ftnames.h> -# endif #endif #ifdef HAVE_FREETYPE_TTNAMEID_H #include <freetype/ttnameid.h> diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c index b526959..59ebe19 100644 --- a/dlls/wineps.drv/truetype.c +++ b/dlls/wineps.drv/truetype.c @@ -49,10 +49,6 @@ #endif #ifdef HAVE_FREETYPE_FTSNAMES_H #include <freetype/ftsnames.h> -#else -# ifdef HAVE_FREETYPE_FTNAMES_H -# include <freetype/ftnames.h> -# endif #endif #ifdef HAVE_FREETYPE_TTNAMEID_H #include <freetype/ttnameid.h> diff --git a/include/config.h.in b/include/config.h.in index f6799c6..b2642c9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -123,9 +123,6 @@ /* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ #undef HAVE_FREETYPE_FTMODAPI_H -/* Define to 1 if you have the <freetype/ftnames.h> header file. */ -#undef HAVE_FREETYPE_FTNAMES_H - /* Define to 1 if you have the <freetype/ftoutln.h> header file. */ #undef HAVE_FREETYPE_FTOUTLN_H

1 0