wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Andrew Eikum : dsound: Request a more exact buffer size from MMDevAPI.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 9d29d9f7665c0e75ed143052408c5fb02fd2afad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d29d9f7665c0e75ed1430524… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 12 15:10:04 2011 -0500 dsound: Request a more exact buffer size from MMDevAPI. --- dlls/dsound/primary.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 7243cc6..9155634 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -84,6 +84,8 @@ static void DSOUND_RecalcPrimary(DirectSoundDevice *device) HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { + UINT prebuf_frames; + REFERENCE_TIME prebuf_rt; HRESULT hres; TRACE("(%p, %d)\n", device, forcewave); @@ -112,10 +114,11 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return hres; } - /* buffer size = 200 * 100000 (100 ns) = 2.0 seconds */ + prebuf_frames = device->prebuf * DSOUND_fraglen(device->pwfx->nSamplesPerSec, device->pwfx->nBlockAlign) / device->pwfx->nBlockAlign; + prebuf_rt = (prebuf_frames / (double)device->pwfx->nSamplesPerSec) * 10000000; hres = IAudioClient_Initialize(device->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, - 200 * 100000, 50000, device->pwfx, NULL); + prebuf_rt, 50000, device->pwfx, NULL); if(FAILED(hres)){ IAudioClient_Release(device->client); device->client = NULL;

1 0

Alistair Leslie-Hughes : url: Remove DllCanUnloadNow and DllGetClassObject.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: d0c38ece9db657431559024abb34285cd8b717b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c38ece9db657431559024ab… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 12 20:59:58 2011 +1100 url: Remove DllCanUnloadNow and DllGetClassObject. --- dlls/url/url.spec | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/url/url.spec b/dlls/url/url.spec index cedd9e4..c2087c4 100644 --- a/dlls/url/url.spec +++ b/dlls/url/url.spec @@ -1,7 +1,5 @@ @ stdcall AddMIMEFileTypesPS(ptr ptr) @ stub AutodialHookCallback -@ stub DllCanUnloadNow -@ stub DllGetClassObject @ stub DummyEntryPoint @ stub DummyEntryPointA @ stdcall FileProtocolHandler(long ptr str long) FileProtocolHandlerA

1 0

Alistair Leslie-Hughes : mscoree: Add WARN when ICorDebugManagedCallback2 cannot be found.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: 44c39a85ae3d277030e645427894c7282b510fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c39a85ae3d277030e645427… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 12 20:40:00 2011 +1100 mscoree: Add WARN when ICorDebugManagedCallback2 cannot be found. --- dlls/mscoree/cordebug.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index 62ded24..c5342bc 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -142,6 +142,10 @@ static HRESULT WINAPI CorDebug_SetManagedHandler(ICorDebug *iface, ICorDebugMana ICorDebugManagedCallback_AddRef(This->pCallback); } + else + { + WARN("Debugging without interface ICorDebugManagedCallback2 is currently not supported.\n"); + } return hr; }

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

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

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

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 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

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

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

← Newer
1
...
49
50
51
52
53
54
55
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011