January 2012 - Wine-commits

Kusanagi Kouichi : gdi32: GetGlyphIndices doesn't substitute glyph.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: fecb1d8b6f81c2bfff7116e80380b1d4f7b7befc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecb1d8b6f81c2bfff7116e80… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Jan 10 19:08:03 2012 +0900 gdi32: GetGlyphIndices doesn't substitute glyph. --- dlls/gdi32/freetype.c | 8 ++++++-- dlls/gdi32/tests/font.c | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b907209..537d81a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4988,7 +4988,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) else ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)buf); TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, buf, ret, default_used); - return get_GSUB_vert_glyph(font,ret); + return ret; } if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) @@ -5001,7 +5001,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) } else glyphId = pFT_Get_Char_Index(font->ft_face, glyph); - return get_GSUB_vert_glyph(font,glyphId); + return glyphId; } /************************************************************* @@ -6373,7 +6373,10 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, *linked_font = font; if((*glyph = get_glyph_index(font, c))) + { + *glyph = get_GSUB_vert_glyph(font, *glyph); return TRUE; + } LIST_FOR_EACH_ENTRY(child_font, &font->child_fonts, CHILD_FONT, entry) { @@ -6384,6 +6387,7 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, if(!child_font->font->ft_face) continue; g = get_glyph_index(child_font->font, c); + g = get_GSUB_vert_glyph(child_font->font, g); if(g) { *glyph = g; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 41ceff4..8d30cdb 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4070,13 +4070,14 @@ todo_wine DeleteFile(ttf_name); } -static void check_vertical_font(const char *name, BOOL *installed, BOOL *selected, GLYPHMETRICS *gm) +static void check_vertical_font(const char *name, BOOL *installed, BOOL *selected, GLYPHMETRICS *gm, WORD *gi) { LOGFONTA lf; HFONT hfont, hfont_prev; HDC hdc; char facename[100]; DWORD ret; + static const WCHAR str[] = { 0x2025 }; *installed = is_truetype_font_installed(name); @@ -4112,6 +4113,9 @@ static void check_vertical_font(const char *name, BOOL *installed, BOOL *selecte if (!*selected) memset(gm, 0, sizeof *gm); + ret = pGetGlyphIndicesW(hdc, str, 1, gi, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed\n"); + SelectObject(hdc, hfont_prev); DeleteObject(hfont); ReleaseDC(NULL, hdc); @@ -4123,10 +4127,11 @@ static void test_vertical_font(void) int num; BOOL ret, installed, selected; GLYPHMETRICS gm; + WORD hgi, vgi; - if (!pAddFontResourceExA || !pRemoveFontResourceExA) + if (!pAddFontResourceExA || !pRemoveFontResourceExA || !pGetGlyphIndicesW) { - win_skip("AddFontResourceExA is not available on this platform\n"); + win_skip("AddFontResourceExA or GetGlyphIndicesW is not available on this platform\n"); return; } @@ -4139,20 +4144,22 @@ static void test_vertical_font(void) num = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); ok(num == 2, "AddFontResourceExA should add 2 fonts from vertical.ttf\n"); - check_vertical_font("@WineTestVertical", &installed, &selected, &gm); + check_vertical_font("@WineTestVertical", &installed, &selected, &gm, &hgi); ok(installed, "@WineTestVertical is not installed\n"); ok(selected, "@WineTestVertical is not selected\n"); ok(gm.gmBlackBoxX > gm.gmBlackBoxY, "gmBlackBoxX(%u) should be greater than gmBlackBoxY(%u) if horizontal\n", gm.gmBlackBoxX, gm.gmBlackBoxY); - check_vertical_font("@@WineTestVertical", &installed, &selected, &gm); + check_vertical_font("@@WineTestVertical", &installed, &selected, &gm, &vgi); ok(installed, "@@WineTestVertical is not installed\n"); ok(selected, "@@WineTestVertical is not selected\n"); ok(gm.gmBlackBoxX < gm.gmBlackBoxY, "gmBlackBoxX(%u) should be less than gmBlackBoxY(%u) if vertical\n", gm.gmBlackBoxX, gm.gmBlackBoxY); + ok(hgi == vgi, "different glyph h:%u v:%u\n", hgi, vgi); + ret = pRemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError());

1 0

Alexandre Julliard : opengl32: Get rid of the DIB section sync support.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: b88b6b74f0a45c4ee1bb89dfdcc8e951e6a1d8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88b6b74f0a45c4ee1bb89dfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 14:34:41 2012 +0100 opengl32: Get rid of the DIB section sync support. --- dlls/opengl32/opengl_ext.h | 3 +-- dlls/opengl32/wgl.c | 36 ------------------------------------ dlls/winex11.drv/init.c | 8 +------- dlls/winex11.drv/opengl.c | 7 +------ 4 files changed, 3 insertions(+), 51 deletions(-) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 988317f..c768560 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -42,8 +42,7 @@ extern void (*wine_tsx11_lock_ptr)(void); extern void (*wine_tsx11_unlock_ptr)(void); /* As GLX relies on X, this is needed */ -void enter_gl(void); -#define ENTER_GL() enter_gl() +#define ENTER_GL() wine_tsx11_lock_ptr() #define LEAVE_GL() wine_tsx11_unlock_ptr() diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cdd6686..98b04d4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -81,22 +81,6 @@ MAKE_FUNCPTR(gluTessVertex) #undef MAKE_FUNCPTR #endif /* SONAME_LIBGLU */ -/* x11drv GDI escapes */ -#define X11DRV_ESCAPE 6789 -enum x11drv_escape_codes -{ - X11DRV_GET_DISPLAY, /* get X11 display for a DC */ - X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ - X11DRV_GET_FONT, /* get current X font for a DC */ - X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ - X11DRV_START_EXPOSURES, /* start graphics exposures */ - X11DRV_END_EXPOSURES, /* end graphics exposures */ - X11DRV_GET_DCE, /* get the DCE pointer */ - X11DRV_SET_DCE, /* set the DCE pointer */ - X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ - X11DRV_SYNC_PIXMAP /* sync the dibsection to its pixmap */ -}; - void (*wine_tsx11_lock_ptr)(void) = NULL; void (*wine_tsx11_unlock_ptr)(void) = NULL; @@ -106,26 +90,6 @@ static void* libglu_handle = NULL; static char* internal_gl_disabled_extensions = NULL; static char* internal_gl_extensions = NULL; -typedef struct wine_glcontext { - HDC hdc; - BOOL do_escape; - /* ... more stuff here */ -} Wine_GLContext; - -void enter_gl(void) -{ - Wine_GLContext *curctx = NtCurrentTeb()->glContext; - - if (curctx && curctx->do_escape) - { - enum x11drv_escape_codes escape = X11DRV_SYNC_PIXMAP; - ExtEscape(curctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, 0, NULL); - } - - wine_tsx11_lock_ptr(); - return; -} - const GLubyte * WINAPI wine_glGetString( GLenum name ); /*********************************************************************** diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 15ab4c2..15f110b 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -429,6 +429,7 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d break; case X11DRV_GET_DCE: case X11DRV_SET_DCE: + case X11DRV_SYNC_PIXMAP: FIXME( "%x escape no longer supported\n", *(const enum x11drv_escape_codes *)in_data ); break; case X11DRV_GET_GLX_DRAWABLE: @@ -438,13 +439,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d return TRUE; } break; - case X11DRV_SYNC_PIXMAP: - if(physDev->bitmap) - { - X11DRV_CoerceDIBSection(physDev, DIB_Status_GdiMod); - return TRUE; - } - return FALSE; case X11DRV_FLUSH_GL_DRAWABLE: flush_gl_drawable(physDev); return TRUE; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0d4d822..e8d0f89 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -111,7 +111,6 @@ typedef struct wine_glpixelformat { typedef struct wine_glcontext { HDC hdc; - BOOL do_escape; BOOL has_been_current; BOOL sharing; DWORD tid; @@ -1950,11 +1949,7 @@ BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) ctx->drawables[1] = drawable; ctx->refresh_drawables = FALSE; - if (type == OBJ_MEMDC) - { - ctx->do_escape = TRUE; - pglDrawBuffer(GL_FRONT_LEFT); - } + if (type == OBJ_MEMDC) pglDrawBuffer(GL_FRONT_LEFT); } else SetLastError(ERROR_INVALID_HANDLE);

1 0

Alexandre Julliard : winex11: Fix support for PALETTEINDEX mapping and get rid of DIBINDEX support.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: c123c2f87af55f6b432e7be8560d65baee603520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c123c2f87af55f6b432e7be85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 11:56:06 2012 +0100 winex11: Fix support for PALETTEINDEX mapping and get rid of DIBINDEX support. --- dlls/winex11.drv/palette.c | 166 ++++++++++++++++---------------------------- 1 files changed, 61 insertions(+), 105 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index e6a2652..ec0f42c 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -882,39 +882,26 @@ static inline BOOL colour_is_brighter(RGBQUAD c1, RGBQUAD c2) COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color ) { HPALETTE hPal = GetCurrentObject(physDev->dev.hdc, OBJ_PAL ); - unsigned char spec_type = color >> 24; - unsigned idx = color & 0xffff; PALETTEENTRY entry; - RGBQUAD quad; - switch(spec_type) + if (color & (1 << 24)) /* PALETTEINDEX */ { - case 2: /* PALETTERGB */ - idx = GetNearestPaletteIndex( hPal, color ); - /* fall through to PALETTEINDEX */ - - case 1: /* PALETTEINDEX */ - if (!GetPaletteEntries( hPal, idx, 1, &entry )) - { - WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx); - return 0; - } + unsigned int idx = LOWORD(color); + if (!GetPaletteEntries( hPal, idx, 1, &entry )) return 0; return RGB( entry.peRed, entry.peGreen, entry.peBlue ); + } - case 0x10: /* DIBINDEX */ - if( GetDIBColorTable( physDev->dev.hdc, idx, 1, &quad ) != 1 ) { - WARN("DIBINDEX(%x) : idx %d is out of bounds, assuming black\n", color , idx); - return 0; - } - return RGB( quad.rgbRed, quad.rgbGreen, quad.rgbBlue ); + if (color >> 24 == 2) /* PALETTERGB */ + { + unsigned int idx = GetNearestPaletteIndex( hPal, color & 0xffffff ); + if (!GetPaletteEntries( hPal, idx, 1, &entry )) return 0; + return RGB( entry.peRed, entry.peGreen, entry.peBlue ); + } - default: - color &= 0xffffff; - /* fall through to RGB */ + if (color >> 16 == 0x10ff) /* DIBINDEX */ + return 0; - case 0: /* RGB */ - return color; - } + return color & 0xffffff; } /*********************************************************************** @@ -926,7 +913,6 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) { WORD index = 0; HPALETTE hPal = GetCurrentObject(physDev->dev.hdc, OBJ_PAL ); - unsigned char spec_type = color >> 24; int *mapping = palette_get_mapping( hPal ); PALETTEENTRY entry; ColorShifts *shifts = &X11DRV_PALETTE_default_shifts; @@ -939,47 +925,35 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) /* there is no colormap limitation; we are going to have to compute * the pixel value from the visual information stored earlier */ + unsigned long red, green, blue; - unsigned long red, green, blue; - unsigned idx = color & 0xffff; - - switch(spec_type) + if (color & (1 << 24)) /* PALETTEINDEX */ { - case 0x10: /* DIBINDEX */ - color = X11DRV_PALETTE_GetColor( physDev, color ); - break; - - case 1: /* PALETTEINDEX */ + unsigned int idx = LOWORD( color ); + if (!GetPaletteEntries( hPal, idx, 1, &entry )) { WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx); return 0; } if (mapping) return mapping[idx]; - color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); - break; - - default: - color &= 0xffffff; - /* fall through to RGB */ - - case 0: /* RGB */ - if (physDev->depth == 1) - { - int white = 1; - RGBQUAD table[2]; - - if (GetDIBColorTable( physDev->dev.hdc, 0, 2, table ) == 2) - { - if(!colour_is_brighter(table[1], table[0])) white = 0; - } - return (((color >> 16) & 0xff) + - ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? white : 1 - white; - } - - } - - red = GetRValue(color); green = GetGValue(color); blue = GetBValue(color); + red = entry.peRed; + green = entry.peGreen; + blue = entry.peBlue; + } + else if (color >> 16 == 0x10ff) /* DIBINDEX */ + { + return 0; + } + else /* RGB */ + { + if (physDev->depth == 1) + return (((color >> 16) & 0xff) + + ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? 1 : 0; + red = GetRValue( color ); + green = GetGValue( color ); + blue = GetBValue( color ); + } if (X11DRV_PALETTE_Graymax) { @@ -1013,51 +987,33 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) if (!mapping) WARN("Palette %p is not realized\n", hPal); - switch(spec_type) /* we have to peruse DC and system palette */ - { - default: - color &= 0xffffff; - /* fall through to RGB */ - - case 0: /* RGB */ - if (physDev->depth == 1) - { - int white = 1; - RGBQUAD table[2]; - - if (GetDIBColorTable( physDev->dev.hdc, 0, 2, table ) == 2) - { - if(!colour_is_brighter(table[1], table[0])) - white = 0; - } - return (((color >> 16) & 0xff) + - ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? white : 1 - white; - } - - EnterCriticalSection( &palette_cs ); - index = X11DRV_SysPaletteLookupPixel( color, FALSE); - if (X11DRV_PALETTE_PaletteToXPixel) index = X11DRV_PALETTE_PaletteToXPixel[index]; - LeaveCriticalSection( &palette_cs ); - - /* TRACE(palette,"RGB(%lx) -> pixel %i\n", color, index); - */ - break; - case 1: /* PALETTEINDEX */ - index = color & 0xffff; - if (!GetPaletteEntries( hPal, index, 1, &entry )) - WARN("PALETTEINDEX(%x) : index %i is out of bounds\n", color, index); - else if (mapping) index = mapping[index]; - - /* TRACE(palette,"PALETTEINDEX(%04x) -> pixel %i\n", (WORD)color, index); - */ - break; - case 2: /* PALETTERGB */ - index = GetNearestPaletteIndex( hPal, color ); - if (mapping) index = mapping[index]; - /* TRACE(palette,"PALETTERGB(%lx) -> pixel %i\n", color, index); - */ - break; - } + if (color & (1 << 24)) /* PALETTEINDEX */ + { + index = LOWORD( color ); + if (!GetPaletteEntries( hPal, index, 1, &entry )) + WARN("PALETTEINDEX(%x) : index %i is out of bounds\n", color, index); + else if (mapping) index = mapping[index]; + } + else if (color >> 24 == 2) /* PALETTERGB */ + { + index = GetNearestPaletteIndex( hPal, color ); + if (mapping) index = mapping[index]; + } + else if (color >> 16 == 0x10ff) /* DIBINDEX */ + { + return 0; + } + else /* RGB */ + { + if (physDev->depth == 1) + return (((color >> 16) & 0xff) + + ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? 1 : 0; + + EnterCriticalSection( &palette_cs ); + index = X11DRV_SysPaletteLookupPixel( color & 0xffffff, FALSE); + if (X11DRV_PALETTE_PaletteToXPixel) index = X11DRV_PALETTE_PaletteToXPixel[index]; + LeaveCriticalSection( &palette_cs ); + } } return index; }

1 0

Alexandre Julliard : winex11: Remove the remainining DIB section locking calls.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 40bf321e5ae9569b4722780db488b5edfdd53c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bf321e5ae9569b4722780db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 14:37:50 2012 +0100 winex11: Remove the remainining DIB section locking calls. --- dlls/winex11.drv/bitblt.c | 3 --- dlls/winex11.drv/brush.c | 4 ---- dlls/winex11.drv/xrender.c | 6 ------ 3 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 8d20277..a54ca49 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1241,9 +1241,6 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info int height = dst->visrect.bottom - dst->visrect.top; image->data = dst_bits.ptr; - /* hack: make sure the bits are readable if we are reading from a DIB section */ - /* to be removed once we get rid of DIB access protections */ - if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, height * image->bytes_per_line ); if (bitmap) { diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 8de8c01..afc1e0b 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -215,8 +215,6 @@ static void BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, GetObjectW( hbitmap, sizeof(bitmap), &bitmap ); - X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod ); - wine_tsx11_lock(); if (physDev->brush.pixmap) XFreePixmap( gdi_display, physDev->brush.pixmap ); @@ -239,8 +237,6 @@ static void BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, } wine_tsx11_unlock(); - X11DRV_DIB_Unlock( physBitmap, TRUE ); - if (physBitmap->depth > 1) { physDev->brush.fillStyle = FillTiled; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cbe9185..dc3d55b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1997,9 +1997,6 @@ static DWORD create_image_pixmap( BITMAPINFO *info, const struct gdi_image_bits if (ret) return ret; image->data = dst_bits.ptr; - /* hack: make sure the bits are readable if we are reading from a DIB section */ - /* to be removed once we get rid of DIB access protections */ - if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, image->height * image->bytes_per_line ); *use_repeat = (width == 1 && height == 1); pa.repeat = *use_repeat ? RepeatNormal : RepeatNone; @@ -2641,8 +2638,6 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct b GetObjectW( bitmap, sizeof(bm), &bm ); - X11DRV_DIB_Lock( physbitmap, DIB_Status_GdiMod ); - wine_tsx11_lock(); pixmap = XCreatePixmap( gdi_display, root_window, bm.bmWidth, bm.bmHeight, physdev->pict_format->depth ); @@ -2662,7 +2657,6 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct b physdev->x11dev->brush.style = BS_PATTERN; wine_tsx11_unlock(); - X11DRV_DIB_Unlock( physbitmap, TRUE ); if (delete_bitmap) DeleteObject( bitmap ); return hbrush;

1 0

Henri Verbeet : ddraw/tests: Add tests for clippers with a destroyed window .
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: e2765579bcafe0a21d671e5bc9605d68145429fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2765579bcafe0a21d671e5bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 22:16:48 2012 +0100 ddraw/tests: Add tests for clippers with a destroyed window. --- dlls/ddraw/clipper.c | 5 +++-- dlls/ddraw/tests/ddraw1.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw2.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw4.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw7.c | 12 ++++++++++++ 5 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index fb5c022..6e40bab 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -104,7 +104,8 @@ static HRGN get_window_region(HWND window) if (!GetClientRect(window, &client_rect)) { - ERR("Failed to get client rect.\n"); + /* This can happen if the window is destroyed, for example. */ + WARN("Failed to get client rect.\n"); return NULL; } @@ -157,7 +158,7 @@ static HRESULT WINAPI ddraw_clipper_GetClipList(IDirectDrawClipper *iface, RECT if (!(region = get_window_region(clipper->window))) { wined3d_mutex_unlock(); - ERR("Failed to get window region.\n"); + WARN("Failed to get window region.\n"); return E_FAIL; } } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 09d632a..6612c4d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -328,6 +328,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + DestroyWindow(window); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); IDirectDrawClipper_Release(clipper); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7ffa977..4d9bf98 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -335,6 +335,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + DestroyWindow(window); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); IDirectDrawClipper_Release(clipper); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3f195b7..c3e550d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -630,6 +630,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface4_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + DestroyWindow(window); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + IDirectDrawSurface4_Release(dst_surface); IDirectDrawSurface4_Release(src_surface); IDirectDrawClipper_Release(clipper); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6075009..3cdfd2b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -623,6 +623,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface7_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + DestroyWindow(window); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + IDirectDrawSurface7_Release(dst_surface); IDirectDrawSurface7_Release(src_surface); IDirectDrawClipper_Release(clipper);

1 0

Henri Verbeet : ddraw: Properly clear the clip list if ddraw_clipper_SetClipList() is called with NULL region data.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 1ef86ad59649372449885cfb8d832b476740cc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef86ad59649372449885cfb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 22:16:49 2012 +0100 ddraw: Properly clear the clip list if ddraw_clipper_SetClipList() is called with NULL region data. --- dlls/ddraw/clipper.c | 6 ++++-- dlls/ddraw/tests/ddraw1.c | 6 ++++++ dlls/ddraw/tests/ddraw2.c | 6 ++++++ dlls/ddraw/tests/ddraw4.c | 6 ++++++ dlls/ddraw/tests/ddraw7.c | 6 ++++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 6e40bab..81e9e8b 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -238,10 +238,12 @@ static HRESULT WINAPI ddraw_clipper_SetClipList(IDirectDrawClipper *iface, RGNDA if (clipper->region) DeleteObject(clipper->region); - if (!(clipper->region = ExtCreateRegion(NULL, 0, region))) + if (!region) + clipper->region = NULL; + else if (!(clipper->region = ExtCreateRegion(NULL, 0, region))) { wined3d_mutex_unlock(); - ERR("Failed to create creation.\n"); + ERR("Failed to create region.\n"); return E_FAIL; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 6612c4d..13464af 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -339,6 +339,12 @@ static void test_clipper_blt(void) ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + hr = IDirectDrawClipper_SetClipList(clipper, NULL, 0); + ok(SUCCEEDED(hr), "Failed to set clip list, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 4d9bf98..8146ff6 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -346,6 +346,12 @@ static void test_clipper_blt(void) ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + hr = IDirectDrawClipper_SetClipList(clipper, NULL, 0); + ok(SUCCEEDED(hr), "Failed to set clip list, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c3e550d..65725b3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -641,6 +641,12 @@ static void test_clipper_blt(void) ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + hr = IDirectDrawClipper_SetClipList(clipper, NULL, 0); + ok(SUCCEEDED(hr), "Failed to set clip list, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface4_Release(dst_surface); IDirectDrawSurface4_Release(src_surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3cdfd2b..0826346 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -634,6 +634,12 @@ static void test_clipper_blt(void) ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + hr = IDirectDrawClipper_SetClipList(clipper, NULL, 0); + ok(SUCCEEDED(hr), "Failed to set clip list, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface7_Release(dst_surface); IDirectDrawSurface7_Release(src_surface);

1 0

Henri Verbeet : wined3d: Simplify transform flag handling in find_ps_compile_args().
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 40e8d8542699f3c27ead7d7622914c50ca695df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e8d8542699f3c27ead7d762… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 22:16:50 2012 +0100 wined3d: Simplify transform flag handling in find_ps_compile_args(). --- dlls/wined3d/shader.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b3d2f7f..1553bf4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1911,24 +1911,13 @@ void find_ps_compile_args(const struct wined3d_state *state, for (i = 0; i < 4; ++i) { DWORD flags = state->texture_states[i][WINED3DTSS_TEXTURETRANSFORMFLAGS]; - DWORD count, tex_transform = 0; - - /* Filter some invalid flags */ - count = flags & ~WINED3DTTFF_PROJECTED; - if (count > WINED3DTTFF_COUNT4 || (!(flags & WINED3DTTFF_PROJECTED) && count != 0)) - { - WARN("The application set an invalid %#x TEXTURETRANSFORMFLAGS value.\n", flags); - count = 0; - } if (flags & WINED3DTTFF_PROJECTED) { enum wined3d_sampler_texture_type sampler_type = shader->reg_maps.sampler_type[i]; + DWORD tex_transform = flags & ~WINED3DTTFF_PROJECTED; DWORD max_valid = WINED3DTTFF_COUNT4; - if (!count) - count = WINED3DTTFF_COUNT4; - if (!state->vertex_shader) { unsigned int j; @@ -1947,10 +1936,12 @@ void find_ps_compile_args(const struct wined3d_state *state, } } - tex_transform = min(count, max_valid); - if (tex_transform != (flags & ~WINED3DTTFF_PROJECTED)) - WARN("Fixing up %#x projected texture transform flag to %#x.\n", - flags & ~WINED3DTTFF_PROJECTED, tex_transform); + if (!tex_transform || tex_transform > max_valid) + { + WARN("Fixing up projected texture transform flags from %#x to %#x.\n", + tex_transform, max_valid); + tex_transform = max_valid; + } if ((sampler_type == WINED3DSTT_1D && tex_transform > WINED3DTTFF_COUNT1) || (sampler_type == WINED3DSTT_2D && tex_transform > WINED3DTTFF_COUNT2) @@ -1958,9 +1949,9 @@ void find_ps_compile_args(const struct wined3d_state *state, tex_transform |= WINED3D_PSARGS_PROJECTED; else WARN("Application requested projected texture with unsuitable texture coordinates.\n"); + + args->tex_transform |= tex_transform << i * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; } - tex_transform &= WINED3D_PSARGS_TEXTRANSFORM_MASK; - args->tex_transform |= tex_transform << i * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; } }

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DTEXTURESTAGESTATETYPE typedef.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 43fcbcb36ee6fa128a68945861b5172ec6f7246d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43fcbcb36ee6fa128a6894586… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 22:16:51 2012 +0100 wined3d: Get rid of the WINED3DTEXTURESTAGESTATETYPE typedef. --- dlls/d3d8/device.c | 60 +++--- dlls/d3d9/device.c | 70 ++++---- dlls/ddraw/device.c | 124 ++++++------ dlls/wined3d/arb_program_shader.c | 282 +++++++++++++------------- dlls/wined3d/ati_fragment_shader.c | 232 +++++++++++----------- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 42 ++-- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/glsl_shader.c | 6 +- dlls/wined3d/nvidia_texture_shader.c | 266 +++++++++++++------------ dlls/wined3d/shader.c | 4 +- dlls/wined3d/state.c | 361 +++++++++++++++++----------------- dlls/wined3d/stateblock.c | 74 ++++---- dlls/wined3d/utils.c | 62 +++--- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 50 +++--- 16 files changed, 827 insertions(+), 816 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43fcbcb36ee6fa128a689…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DTEXTURETRANSFORMFLAGS typedef.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 7f7bc520b6610528b5db351502299b4c9589d6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f7bc520b6610528b5db35150… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 22:16:52 2012 +0100 wined3d: Get rid of the WINED3DTEXTURETRANSFORMFLAGS typedef. --- dlls/wined3d/glsl_shader.c | 53 ++++++++++++++++++++++++++------------ dlls/wined3d/shader.c | 12 ++++---- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 60 +++++++++++++++++++++++++++----------------- include/wine/wined3d.h | 17 ++++++------ 5 files changed, 88 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f7bc520b6610528b5db3…

1 0

Jörg Höhle : winealsa: Fix AudioRenderClient Get/ ReleaseBuffer protocol.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 2b51d38d3cf5e2f4e14d905c9263b1222dad3ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b51d38d3cf5e2f4e14d905c9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 18:24:20 2012 +0100 winealsa: Fix AudioRenderClient Get/ReleaseBuffer protocol. --- dlls/winealsa.drv/mmdevdrv.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a2a2a7d..29933e8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -116,6 +116,7 @@ struct ACImpl { HANDLE timer; BYTE *local_buffer, *tmp_buffer; int buf_state; + long getbuf_last; /* <0 when using tmp_buffer */ CRITICAL_SECTION lock; @@ -1763,7 +1764,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } - if(This->buf_state != NOT_LOCKED){ + if(This->buf_state != NOT_LOCKED || This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } @@ -1964,16 +1965,16 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, if(!data) return E_POINTER; + *data = NULL; EnterCriticalSection(&This->lock); - if(This->buf_state != NOT_LOCKED){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } if(!frames){ - This->buf_state = LOCKED_NORMAL; LeaveCriticalSection(&This->lock); return S_OK; } @@ -2003,10 +2004,10 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->tmp_buffer_frames = frames; } *data = This->tmp_buffer; - This->buf_state = LOCKED_WRAPPED; + This->getbuf_last = -frames; }else{ *data = This->local_buffer + write_pos * This->fmt->nBlockAlign; - This->buf_state = LOCKED_NORMAL; + This->getbuf_last = frames; } LeaveCriticalSection(&This->lock); @@ -2042,13 +2043,23 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( EnterCriticalSection(&This->lock); - if(This->buf_state == NOT_LOCKED || !written_frames){ - This->buf_state = NOT_LOCKED; + if(!written_frames){ + This->getbuf_last = 0; LeaveCriticalSection(&This->lock); - return written_frames ? AUDCLNT_E_OUT_OF_ORDER : S_OK; + return S_OK; } - if(This->buf_state == LOCKED_NORMAL) + if(!This->getbuf_last){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_OUT_OF_ORDER; + } + + if(written_frames > (This->getbuf_last >= 0 ? This->getbuf_last : -This->getbuf_last)){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_INVALID_SIZE; + } + + if(This->getbuf_last >= 0) buffer = This->local_buffer + This->fmt->nBlockAlign * ((This->lcl_offs_frames + This->held_frames) % This->bufsize_frames); else @@ -2061,12 +2072,12 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( memset(buffer, 0, written_frames * This->fmt->nBlockAlign); } - if(This->buf_state == LOCKED_WRAPPED) + if(This->getbuf_last < 0) alsa_wrap_buffer(This, buffer, written_frames); This->held_frames += written_frames; This->written_frames += written_frames; - This->buf_state = NOT_LOCKED; + This->getbuf_last = 0; LeaveCriticalSection(&This->lock);

1 0