October 2011 - Wine-commits

Huw Davies : gdi32: Use the helper to get the bounding rectangle.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: db6fe9ee9b962de4826ce2655fcaa0536a9a5ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6fe9ee9b962de4826ce2655… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 13:07:32 2011 +0100 gdi32: Use the helper to get the bounding rectangle. --- dlls/gdi32/dibdrv/bitblt.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index f78f9a2..25554bb 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1034,13 +1034,7 @@ DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit src_start.x, src_start.y, h_params.src_inc, v_params.src_inc, h_params.length, v_params.length); - rect.left = dst_start.x; - rect.top = dst_start.y; - rect.right = dst_end.x; - rect.bottom = dst_end.y; - - if (rect.right < rect.left) { INT tmp = rect.left; rect.left = rect.right+1; rect.right = tmp+1; } - if (rect.bottom < rect.top) { INT tmp = rect.top; rect.top = rect.bottom+1; rect.bottom = tmp+1; } + get_bounding_rect( &rect, dst_start.x, dst_start.y, dst_end.x - dst_start.x, dst_end.y - dst_start.y ); intersect_rect( &dst->visrect, &dst->visrect, &rect ); dst_start.x -= dst->visrect.left;

1 0

Alexander Morozov : server: Fix overlapping shared and exclusive locks support.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: d0451f6b3f1c6ad9501fcf11ac1d8e6bd202a121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0451f6b3f1c6ad9501fcf11a… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Oct 12 14:58:57 2011 +0400 server: Fix overlapping shared and exclusive locks support. --- dlls/kernel32/tests/file.c | 1 - server/fd.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f607cfd..a720d52 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1671,7 +1671,6 @@ static void test_LockFile(void) ok( !LockFileEx( handle2, LOCKFILE_FAIL_IMMEDIATELY, 0, 100, 0, &overlapped ), "LockFileEx handle2 300,100 succeeded\n" ); ret = LockFileEx( handle, LOCKFILE_FAIL_IMMEDIATELY, 0, 100, 0, &overlapped ); - todo_wine ok( ret, "LockFileEx 300,100 failed\n" ); ok( UnlockFileEx( handle, 0, 100, 0, &overlapped ), "UnlockFileEx 300,100 failed\n" ); /* exclusive lock is removed first */ diff --git a/server/fd.c b/server/fd.c index 798f99e..a8b3a5f 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1321,9 +1321,9 @@ static struct file_lock *add_lock( struct fd *fd, int shared, file_pos_t start, release_object( lock ); return NULL; } - list_add_head( &fd->locks, &lock->fd_entry ); - list_add_head( &fd->inode->locks, &lock->inode_entry ); - list_add_head( &lock->process->locks, &lock->proc_entry ); + list_add_tail( &fd->locks, &lock->fd_entry ); + list_add_tail( &fd->inode->locks, &lock->inode_entry ); + list_add_tail( &lock->process->locks, &lock->proc_entry ); return lock; } @@ -1395,7 +1395,7 @@ obj_handle_t lock_fd( struct fd *fd, file_pos_t start, file_pos_t count, int sha { struct file_lock *lock = LIST_ENTRY( ptr, struct file_lock, inode_entry ); if (!lock_overlaps( lock, start, end )) continue; - if (lock->shared && shared) continue; + if (shared && (lock->shared || lock->fd == fd)) continue; /* found one */ if (!wait) {

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDOMNode replaceChild.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: 531a07db142c28026fec1ea7ad1c4048eb1ebfff URL: http://source.winehq.org/git/wine.git/?a=commit;h=531a07db142c28026fec1ea7a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 19 15:58:30 2011 +1100 mshtml: Implement IHTMLDOMNode replaceChild. --- dlls/mshtml/htmlnode.c | 33 +++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index dbb5888..8962acf 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -580,8 +580,37 @@ static HRESULT WINAPI HTMLDOMNode_replaceChild(IHTMLDOMNode *iface, IHTMLDOMNode IHTMLDOMNode *oldChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - FIXME("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); - return E_NOTIMPL; + HTMLDOMNode *node_new; + HTMLDOMNode *node_old; + nsIDOMNode *nsnode; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); + + node_new = get_node_obj(This->doc, (IUnknown*)newChild); + if(!node_new) + return E_FAIL; + + node_old = get_node_obj(This->doc, (IUnknown*)oldChild); + if(!node_old) + return E_FAIL; + + nsres = nsIDOMNode_ReplaceChild(This->nsnode, node_new->nsnode, node_old->nsnode, &nsnode); + if(NS_FAILED(nsres)) { + return E_FAIL; + } + + nsnode = node_new->nsnode; + + hres = get_node(This->doc, nsnode, TRUE, &node_new); + nsIDOMNode_Release(nsnode); + if(FAILED(hres)) + return hres; + + *node = &node_new->IHTMLDOMNode_iface; + IHTMLDOMNode_AddRef(*node); + return S_OK; } static HRESULT WINAPI HTMLDOMNode_cloneNode(IHTMLDOMNode *iface, VARIANT_BOOL fDeep, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0ce3ead..6cc1733 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5639,6 +5639,41 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLElement_Release(body); } +static void test_replacechild_elems(IHTMLDocument2 *doc) +{ + IHTMLElement *body; + IHTMLDOMNode *node, *node2, *node3; + IHTMLDOMNode *nodeBody, *nodeNew; + HRESULT hres; + VARIANT var; + + body = doc_get_body(doc); + + node = test_create_text(doc, "insert"); + + V_VT(&var) = VT_NULL; + V_DISPATCH(&var) = NULL; + node2 = test_node_insertbefore((IUnknown*)body, node, &var); + IHTMLDOMNode_Release(node); + + test_elem_innertext(body, "insert"); + + node3 = test_create_text(doc, "replaced"); + + nodeBody = _get_node_iface(__LINE__, (IUnknown *)body); + + hres = IHTMLDOMNode_replaceChild(nodeBody, node3, node2, &nodeNew); + ok(hres == S_OK, "Expected S_OK, got 0x%08x\n", hres); + + test_elem_innertext(body, "replaced"); + + IHTMLDOMNode_Release(node2); + IHTMLDOMNode_Release(node3); + IHTMLDOMNode_Release(nodeBody); + + IHTMLElement_Release(body); +} + static void test_null_write(IHTMLDocument2 *doc) { HRESULT hres; @@ -6201,6 +6236,7 @@ START_TEST(dom) run_domtest(cond_comment_str, test_cond_comment); run_domtest(frameset_str, test_frameset); run_domtest(emptydiv_str, test_docfrag); + run_domtest(doc_blank, test_replacechild_elems); CoUninitialize(); }

1 0

Octavian Voicu : ddraw: Keep track of interface attached by AddAttachedSurface and detach correct interface when parent is released .
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: b44eef7085dd535b87b638068812cdde44f209c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44eef7085dd535b87b638068… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Tue Oct 11 22:59:21 2011 +0300 ddraw: Keep track of interface attached by AddAttachedSurface and detach correct interface when parent is released. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 81 +++++++++++++++---------------------------- dlls/ddraw/tests/refcount.c | 12 +++++- 3 files changed, 39 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b44eef7085dd535b87b63…

1 0

Nikolay Sivov : ntdll: Fix SID data copy length.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: 7c648cb6956ac1f47cd0f4d88850482740628a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c648cb6956ac1f47cd0f4d88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 10 12:07:30 2011 -0500 ntdll: Fix SID data copy length. --- dlls/ntdll/nt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6a919aa..30d3e34 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -348,7 +348,7 @@ NTSTATUS WINAPI NtQueryInformationToken( groups->GroupCount = tg->count; memcpy( sids, (char *)buffer + non_sid_portion, - reply->user_len - non_sid_portion - FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] )); + reply->user_len - FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] )); for (i = 0; i < tg->count; i++) {

1 0

Alexandre Julliard : gdi32: Add an all-one alpha channel when converting a DIB for blending.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: 8f4d50ea4b7bec42597a92d2b24b1521e93b8591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f4d50ea4b7bec42597a92d2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 17:57:02 2011 +0200 gdi32: Add an all-one alpha channel when converting a DIB for blending. --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/dib.c | 6 +++--- dlls/gdi32/dibdrv/dc.c | 13 ++++++++++++- dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a2a7698..e03a5c1 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -160,7 +160,7 @@ void free_heap_bits( struct gdi_image_bits *bits ) } static DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, - BITMAPINFO *dst_info, struct gdi_image_bits *bits ) + BITMAPINFO *dst_info, struct gdi_image_bits *bits, BOOL add_alpha ) { void *ptr; DWORD err; @@ -169,7 +169,7 @@ static DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src if (!(ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) return ERROR_OUTOFMEMORY; - err = convert_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr ); + err = convert_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr, add_alpha ); if (bits->free) bits->free( bits ); bits->ptr = ptr; bits->is_copy = TRUE; @@ -252,7 +252,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, dst_info->bmiHeader.biClrUsed = 1; } - if (!(err = convert_bits( src_info, src, dst_info, &bits ))) + if (!(err = convert_bits( src_info, src, dst_info, &bits, FALSE ))) { /* get rid of the fake 1-bpp table */ if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; @@ -309,7 +309,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, src_info->bmiHeader.biClrUsed = 2; } - err = convert_bits( src_info, src, dst_info, &bits ); + err = convert_bits( src_info, src, dst_info, &bits, TRUE ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 3739cb7..56efda7 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -591,7 +591,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); if (ptr) { - err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr ); + err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr, FALSE ); if (src_bits.free) src_bits.free( &src_bits ); src_bits.ptr = ptr; src_bits.is_copy = TRUE; @@ -721,7 +721,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); if (ptr) { - err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr ); + err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr, FALSE ); if (src_bits.free) src_bits.free( &src_bits ); src_bits.ptr = ptr; src_bits.is_copy = TRUE; @@ -1226,7 +1226,7 @@ INT WINAPI GetDIBits( else dst_info->bmiHeader.biHeight = -src.height; - convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits ); + convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits, FALSE ); if (src_bits.free) src_bits.free( &src_bits ); ret = lines; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f610390..883a60a 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -278,7 +278,7 @@ void copy_dib_color_info(dib_info *dst, const dib_info *src) } DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits ) + const BITMAPINFO *dst_info, void *dst_bits, BOOL add_alpha ) { dib_info src_dib, dst_dib; DWORD ret; @@ -306,6 +306,17 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit src->x -= src->visrect.left; src->y -= src->visrect.top; offset_rect( &src->visrect, -src->visrect.left, -src->visrect.top ); + + if (add_alpha && dst_dib.funcs == &funcs_8888 && src_dib.funcs != &funcs_8888) + { + DWORD *pixel = dst_dib.bits.ptr; + int x, y; + + for (y = src->visrect.top; y < src->visrect.bottom; y++, pixel += dst_dib.stride / 4) + for (x = src->visrect.left; x < src->visrect.right; x++) + pixel[x] |= 0xff000000; + } + return ERROR_SUCCESS; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6a600a4..76e146b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -252,7 +252,7 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN; + const BITMAPINFO *dst_info, void *dst_bits, BOOL add_alpha ) DECLSPEC_HIDDEN; extern DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst,

1 0

Alexandre Julliard : gdi32: Move some common code out of the individual copy_rect functions.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: d1d8b4de0b23d681e599282add580ff09cb7e356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d8b4de0b23d681e599282ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 18:09:31 2011 +0200 gdi32: Move some common code out of the individual copy_rect functions. --- dlls/gdi32/dibdrv/bitblt.c | 22 +++++++++++ dlls/gdi32/dibdrv/primitives.c | 78 ---------------------------------------- 2 files changed, 22 insertions(+), 78 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 25554bb..beee303 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -473,6 +473,28 @@ static DWORD copy_rect( dib_info *dst, const RECT *dst_rect, const dib_info *src RECT clipped_rect; const WINEREGION *clip_data; int i, start, end, overlap; + DWORD and = 0, xor = 0; + + switch (rop2) + { + case R2_NOT: and = ~0u; + /* fall through */ + case R2_WHITE: xor = ~0u; + /* fall through */ + case R2_BLACK: + if (clip) + { + clip_data = get_wine_region( clip ); + for (i = 0; i < clip_data->numRects; i++) + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + dst->funcs->solid_rects( dst, 1, &clipped_rect, and, xor ); + release_wine_region( clip ); + } + else dst->funcs->solid_rects( dst, 1, dst_rect, and, xor ); + /* fall through */ + case R2_NOP: + return ERROR_SUCCESS; + } origin.x = src_rect->left; origin.y = src_rect->top; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 4149878..81e502a 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -785,22 +785,9 @@ static void copy_rect_32(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap) { DWORD *dst_start, *src_start; - DWORD and = 0, xor = 0; struct rop_codes codes; int y, dst_stride, src_stride; - switch (rop2) - { - case R2_NOP: return; - case R2_NOT: and = ~0u; - /* fall through */ - case R2_WHITE: xor = ~0u; - /* fall through */ - case R2_BLACK: - dst->funcs->solid_rects( dst, 1, rc, and, xor ); - return; - } - if (overlap & OVERLAP_BELOW) { dst_start = get_pixel_ptr_32(dst, rc->left, rc->bottom - 1); @@ -837,22 +824,9 @@ static void copy_rect_24(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap) { BYTE *dst_start, *src_start; - DWORD and = 0, xor = 0; int y, dst_stride, src_stride; struct rop_codes codes; - switch (rop2) - { - case R2_NOP: return; - case R2_NOT: and = ~0u; - /* fall through */ - case R2_WHITE: xor = ~0u; - /* fall through */ - case R2_BLACK: - dst->funcs->solid_rects( dst, 1, rc, and, xor ); - return; - } - if (overlap & OVERLAP_BELOW) { dst_start = get_pixel_ptr_24(dst, rc->left, rc->bottom - 1); @@ -889,22 +863,9 @@ static void copy_rect_16(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap) { WORD *dst_start, *src_start; - DWORD and = 0, xor = 0; int y, dst_stride, src_stride; struct rop_codes codes; - switch (rop2) - { - case R2_NOP: return; - case R2_NOT: and = ~0u; - /* fall through */ - case R2_WHITE: xor = ~0u; - /* fall through */ - case R2_BLACK: - dst->funcs->solid_rects( dst, 1, rc, and, xor ); - return; - } - if (overlap & OVERLAP_BELOW) { dst_start = get_pixel_ptr_16(dst, rc->left, rc->bottom - 1); @@ -941,22 +902,9 @@ static void copy_rect_8(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap) { BYTE *dst_start, *src_start; - DWORD and = 0, xor = 0; int y, dst_stride, src_stride; struct rop_codes codes; - switch (rop2) - { - case R2_NOP: return; - case R2_NOT: and = ~0u; - /* fall through */ - case R2_WHITE: xor = ~0u; - /* fall through */ - case R2_BLACK: - dst->funcs->solid_rects( dst, 1, rc, and, xor ); - return; - } - if (overlap & OVERLAP_BELOW) { dst_start = get_pixel_ptr_8(dst, rc->left, rc->bottom - 1); @@ -993,22 +941,9 @@ static void copy_rect_4(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap) { BYTE *dst_start, *src_start; - DWORD and = 0, xor = 0; int y, dst_stride, src_stride; struct rop_codes codes; - switch (rop2) - { - case R2_NOP: return; - case R2_NOT: and = ~0u; - /* fall through */ - case R2_WHITE: xor = ~0u; - /* fall through */ - case R2_BLACK: - dst->funcs->solid_rects( dst, 1, rc, and, xor ); - return; - } - if (overlap & OVERLAP_BELOW) { dst_start = get_pixel_ptr_4(dst, 0, rc->bottom - 1); @@ -1047,22 +982,9 @@ static void copy_rect_1(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap) { BYTE *dst_start, *src_start; - DWORD and = 0, xor = 0; int y, dst_stride, src_stride; struct rop_codes codes; - switch (rop2) - { - case R2_NOP: return; - case R2_NOT: and = ~0u; - /* fall through */ - case R2_WHITE: xor = ~0u; - /* fall through */ - case R2_BLACK: - dst->funcs->solid_rects( dst, 1, rc, and, xor ); - return; - } - if (overlap & OVERLAP_BELOW) { dst_start = get_pixel_ptr_1(dst, 0, rc->bottom - 1);

1 0

Alexandre Julliard : gdi32: Add a helper function to look up color table entries, and default to 0 for missing entries.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: 8a41d75e295f96d48f58b8bd13b7b75195dc5754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a41d75e295f96d48f58b8bd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 20:14:13 2011 +0200 gdi32: Add a helper function to look up color table entries, and default to 0 for missing entries. --- dlls/gdi32/dibdrv/primitives.c | 95 +++++++++++++--------------------------- 1 files changed, 31 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a41d75e295f96d48f58b…

1 0

Aric Stewart : usp10: Correct where the trailing flag transitions in the middle of a glyph.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: c1607a04b9ae92b517cb788ef2ac7b22507c041a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1607a04b9ae92b517cb788ef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 12 11:33:40 2011 -0500 usp10: Correct where the trailing flag transitions in the middle of a glyph. --- dlls/usp10/tests/usp10.c | 30 ++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 2 +- 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5eb48e1..180bcfb 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1910,6 +1910,21 @@ static void test_ScriptXtoX(void) else /* win2k3 */ ok(piCP == 10, "Negative iX should return piCP=10 not %d\n", piCP); + for (iX = 0; iX <= 7; iX++) + { + WORD clust = 0; + INT advance = 16; + hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(piCP==0 && piTrailing==0,"%i should return 0(%i) and 0(%i)\n",iX, piCP,piTrailing); + } + for (iX = 8; iX < 16; iX++) + { + WORD clust = 0; + INT advance = 16; + hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(piCP==0 && piTrailing==1,"%i should return 0(%i) and 1(%i)\n",iX, piCP,piTrailing); + } + sa.fRTL = TRUE; hr = ScriptXtoCP(-1, 10, 10, pwLogClust_RTL, psva, piAdvance, &sa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); @@ -1924,6 +1939,21 @@ static void test_ScriptXtoX(void) ok(piCP == -1, "iX=%d should return piCP=-1 not %d\n", iX, piCP); ok(piTrailing == 1, "iX=%d should return piTrailing=1 not %d\n", iX, piTrailing); + for (iX = 1; iX <= 8; iX++) + { + WORD clust = 0; + INT advance = 16; + hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(piCP==0 && piTrailing==1,"%i should return 0(%i) and 1(%i)\n",iX,piCP,piTrailing); + } + for (iX = 9; iX < 16; iX++) + { + WORD clust = 0; + INT advance = 16; + hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(piCP==0 && piTrailing==0,"%i should return 0(%i) and 0(%i)\n",iX,piCP,piTrailing); + } + sa.fRTL = FALSE; test_item_ScriptXtoX(&sa, 10, 10, offsets, pwLogClust, piAdvance); sa.fRTL = TRUE; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 527f7b8..df6f75a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1806,7 +1806,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, { if (iPosX > iX) item--; - if (item < cChars && ((iPosX - iLastPosX) / 2.0) + iX > iPosX) + if (item < cChars && ((iPosX - iLastPosX) / 2.0) + iX >= iPosX) *piTrailing = 1; else *piTrailing = 0;

1 0

Charles Davis : libwine: Fix linking with non-Apple GCC.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: c857bdd09d0c0c2e40791ac13a5320fa161a498f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c857bdd09d0c0c2e40791ac13… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Oct 12 11:49:47 2011 -0600 libwine: Fix linking with non-Apple GCC. --- libs/wine/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 1ef9ff2..ca93d26 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -128,7 +128,7 @@ libwine.a: wine.def libwine.dll: $(OBJS) wine.def Makefile.in $(DLLWRAP) --def $(srcdir)/wine.def -o $@ $(OBJS) $(EXTRALIBS) -DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) -headerpad_max_install_names +DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) -Wl,-headerpad_max_install_names libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in $(LDSHARED) -install_name $(libdir)/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@

1 0