December 2012 - Wine-commits

Alexandre Julliard : gdi32: Store and return ABC metrics from get_glyph_outline.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: e8b6701fe126702004e66b404962bbf38a52c233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b6701fe126702004e66b404… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 4 18:14:56 2012 +0100 gdi32: Store and return ABC metrics from get_glyph_outline. --- dlls/gdi32/freetype.c | 85 +++++++++++++++--------------------------------- 1 files changed, 27 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 98c66a0..c5543e1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -288,10 +288,8 @@ typedef struct tagFamily { typedef struct { GLYPHMETRICS gm; - INT adv; /* These three hold to widths of the unrotated chars */ - INT lsb; - INT bbx; - BOOL init; + ABC abc; /* metrics of the unrotated char */ + BOOL init; } GM; typedef struct { @@ -5852,7 +5850,7 @@ static inline BYTE get_max_level( UINT format ) static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, - LPGLYPHMETRICS lpgm, DWORD buflen, LPVOID buf, + LPGLYPHMETRICS lpgm, ABC *abc, DWORD buflen, LPVOID buf, const MAT2* lpmat) { static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; @@ -5862,7 +5860,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, DWORD width, height, pitch, needed = 0; FT_Bitmap ft_bitmap; FT_Error err; - INT left, right, top = 0, bottom = 0, adv, lsb, bbx; + INT left, right, top = 0, bottom = 0, adv; FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; double widthRatio = 1.0; @@ -5907,6 +5905,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FONT_GM(font,original_index)->init && is_identity_MAT2(lpmat)) { *lpgm = FONT_GM(font,original_index)->gm; + *abc = FONT_GM(font,original_index)->abc; TRACE("cached: %u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, wine_dbgstr_point(&lpgm->gmptGlyphOrigin), lpgm->gmCellIncX, lpgm->gmCellIncY); @@ -6059,12 +6058,13 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, adv = (vec.x+63) >> 6; } - lsb = left >> 6; - bbx = (right - left) >> 6; lpgm->gmBlackBoxX = (right - left) >> 6; lpgm->gmBlackBoxY = (top - bottom) >> 6; lpgm->gmptGlyphOrigin.x = left >> 6; lpgm->gmptGlyphOrigin.y = top >> 6; + abc->abcA = left >> 6; + abc->abcB = (right - left) >> 6; + abc->abcC = adv - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, wine_dbgstr_point(&lpgm->gmptGlyphOrigin), @@ -6074,9 +6074,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, is_identity_MAT2(lpmat)) /* don't cache custom transforms */ { FONT_GM(font,original_index)->gm = *lpgm; - FONT_GM(font,original_index)->adv = adv; - FONT_GM(font,original_index)->lsb = lsb; - FONT_GM(font,original_index)->bbx = bbx; + FONT_GM(font,original_index)->abc = *abc; FONT_GM(font,original_index)->init = TRUE; } @@ -7058,6 +7056,7 @@ static DWORD freetype_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, { struct freetype_physdev *physdev = get_freetype_dev( dev ); DWORD ret; + ABC abc; if (!physdev->font) { @@ -7067,7 +7066,7 @@ static DWORD freetype_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - ret = get_glyph_outline( physdev->font, glyph, format, lpgm, buflen, buf, lpmat ); + ret = get_glyph_outline( physdev->font, glyph, format, lpgm, &abc, buflen, buf, lpmat ); LeaveCriticalSection( &freetype_cs ); return ret; } @@ -7197,8 +7196,7 @@ static BOOL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, L static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; - FT_UInt glyph_index; - GdiFont *linked_font; + ABC abc; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7212,10 +7210,8 @@ static BOOL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, L GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); for(c = firstChar; c <= lastChar; c++) { - get_glyph_index_linked(physdev->font, c, &linked_font, &glyph_index); - get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c - firstChar] = FONT_GM(linked_font,glyph_index)->adv; + get_glyph_outline( physdev->font, c, GGO_METRICS, &gm, &abc, 0, NULL, &identity ); + buffer[c - firstChar] = abc.abcA + abc.abcB + abc.abcC; } LeaveCriticalSection( &freetype_cs ); return TRUE; @@ -7229,8 +7225,6 @@ static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastCha static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; - FT_UInt glyph_index; - GdiFont *linked_font; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7244,15 +7238,9 @@ static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastCha GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - for(c = firstChar; c <= lastChar; c++) { - get_glyph_index_linked(physdev->font, c, &linked_font, &glyph_index); - get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c - firstChar].abcA = FONT_GM(linked_font,glyph_index)->lsb; - buffer[c - firstChar].abcB = FONT_GM(linked_font,glyph_index)->bbx; - buffer[c - firstChar].abcC = FONT_GM(linked_font,glyph_index)->adv - FONT_GM(linked_font,glyph_index)->lsb - - FONT_GM(linked_font,glyph_index)->bbx; - } + for(c = firstChar; c <= lastChar; c++, buffer++) + get_glyph_outline( physdev->font, c, GGO_METRICS, &gm, buffer, 0, NULL, &identity ); + LeaveCriticalSection( &freetype_cs ); return TRUE; } @@ -7265,8 +7253,6 @@ static BOOL freetype_GetCharABCWidthsI( PHYSDEV dev, UINT firstChar, UINT count, static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; - FT_UInt glyph_index; - GdiFont *linked_font; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7281,25 +7267,9 @@ static BOOL freetype_GetCharABCWidthsI( PHYSDEV dev, UINT firstChar, UINT count, GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - get_glyph_index_linked(physdev->font, 'a', &linked_font, &glyph_index); - if (!pgi) - for(c = firstChar; c < firstChar+count; c++) { - get_glyph_outline(linked_font, c, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c - firstChar].abcA = FONT_GM(linked_font,c)->lsb; - buffer[c - firstChar].abcB = FONT_GM(linked_font,c)->bbx; - buffer[c - firstChar].abcC = FONT_GM(linked_font,c)->adv - FONT_GM(linked_font,c)->lsb - - FONT_GM(linked_font,c)->bbx; - } - else - for(c = 0; c < count; c++) { - get_glyph_outline(linked_font, pgi[c], GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c].abcA = FONT_GM(linked_font,pgi[c])->lsb; - buffer[c].abcB = FONT_GM(linked_font,pgi[c])->bbx; - buffer[c].abcC = FONT_GM(linked_font,pgi[c])->adv - - FONT_GM(linked_font,pgi[c])->lsb - FONT_GM(linked_font,pgi[c])->bbx; - } + for(c = 0; c < count; c++, buffer++) + get_glyph_outline( physdev->font, pgi ? pgi[c] : firstChar + c, GGO_METRICS | GGO_GLYPH_INDEX, + &gm, buffer, 0, NULL, &identity ); LeaveCriticalSection( &freetype_cs ); return TRUE; @@ -7314,10 +7284,9 @@ static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; INT idx; INT nfit = 0, ext; + ABC abc; GLYPHMETRICS gm; TEXTMETRICW tm; - FT_UInt glyph_index; - GdiFont *linked_font; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7336,10 +7305,8 @@ static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, size->cy = tm.tmHeight; for(idx = 0; idx < count; idx++) { - get_glyph_index_linked( physdev->font, wstr[idx], &linked_font, &glyph_index ); - get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - size->cx += FONT_GM(linked_font,glyph_index)->adv; + get_glyph_outline( physdev->font, wstr[idx], GGO_METRICS, &gm, &abc, 0, NULL, &identity ); + size->cx += abc.abcA + abc.abcB + abc.abcC; ext = size->cx; if (! pnfit || ext <= max_ext) { ++nfit; @@ -7365,6 +7332,7 @@ static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, IN static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; INT idx; INT nfit = 0, ext; + ABC abc; GLYPHMETRICS gm; TEXTMETRICW tm; struct freetype_physdev *physdev = get_freetype_dev( dev ); @@ -7385,8 +7353,9 @@ static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, IN size->cy = tm.tmHeight; for(idx = 0; idx < count; idx++) { - get_glyph_outline(physdev->font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); - size->cx += FONT_GM(physdev->font,indices[idx])->adv; + get_glyph_outline( physdev->font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, + &gm, &abc, 0, NULL, &identity ); + size->cx += abc.abcA + abc.abcB + abc.abcC; ext = size->cx; if (! pnfit || ext <= max_ext) { ++nfit;

1 0

Vincent Povirk : gdiplus: Add a test for drawing to HDC' s backed by 32-bit alpha dibs.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 2ddb3b7d9326d639d608e513dcef67855f23390b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ddb3b7d9326d639d608e513d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Dec 3 16:00:36 2012 -0600 gdiplus: Add a test for drawing to HDC's backed by 32-bit alpha dibs. --- dlls/gdiplus/tests/graphics.c | 50 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5fc1626..553e77f 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4083,6 +4083,55 @@ static void test_measured_extra_space(void) GdipDeleteStringFormat(format); } +static void test_alpha_hdc(void) +{ + GpStatus status; + HDC hdc; + HBITMAP hbm, old_hbm; + GpGraphics *graphics; + ULONG *bits; + BITMAPINFO bmi; + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biHeight = 5; + bmi.bmiHeader.biWidth = 5; + bmi.bmiHeader.biBitCount = 32; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biClrUsed = 0; + + hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + old_hbm = SelectObject(hdc, hbm); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + bits[0] = 0xdeadbeef; + + status = GdipGraphicsClear(graphics, 0xffaaaaaa); + expect(Ok, status); + + todo_wine expect(0xffaaaaaa, bits[0]); + + SelectObject(hdc, old_hbm); + + bits[0] = 0xdeadbeef; + + status = GdipGraphicsClear(graphics, 0xffbbbbbb); + expect(Ok, status); + + todo_wine expect(0xffbbbbbb, bits[0]); + + GdipDeleteGraphics(graphics); + + DeleteObject(hbm); + DeleteDC(hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4149,6 +4198,7 @@ START_TEST(graphics) test_get_set_interpolation(); test_get_set_textrenderinghint(); test_getdc_scaled(); + test_alpha_hdc(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Andrew Eikum : winmm: Don' t mask out SND_ALIAS_ID or SND_FILENAME in sndPlaySound.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: b1d9d43af7fad7308b26cc62a23483a96e4547bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d9d43af7fad7308b26cc62a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Dec 4 11:41:10 2012 -0600 winmm: Don't mask out SND_ALIAS_ID or SND_FILENAME in sndPlaySound. --- dlls/winmm/playsound.c | 4 ++-- dlls/winmm/tests/wave.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 0d32274..64db333 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -560,7 +560,7 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSoundW, HMODULE hmod, DWORD fdwSound) */ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) { - uFlags &= SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSoundA, 0, uFlags, FALSE); } @@ -569,7 +569,7 @@ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) */ BOOL WINAPI sndPlaySoundW(LPCWSTR pszSound, UINT uFlags) { - uFlags &= SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSound, 0, uFlags, TRUE); } diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 28b4145..97849f5 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1443,8 +1443,41 @@ static void wave_out_tests(void) wave_out_test_device(WAVE_MAPPER); } +static void test_sndPlaySound(void) +{ + BOOL br; + + static const WCHAR not_existW[] = {'C',':','\\','n','o','t','_','e','x','i','s','t','.','w','a','v',0}; + static const WCHAR SystemAsteriskW[] = {'S','y','s','t','e','m','A','s','t','e','r','i','s','k',0}; + + br = sndPlaySoundA((LPCSTR)SND_ALIAS_SYSTEMASTERISK, SND_ALIAS_ID|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundW((LPCWSTR)SND_ALIAS_SYSTEMASTERISK, SND_ALIAS_ID|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundA((LPCSTR)sndAlias('X','Y'), SND_ALIAS_ID|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundW((LPCWSTR)sndAlias('X','Y'), SND_ALIAS_ID|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundA("SystemAsterisk", SND_ALIAS|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundW(SystemAsteriskW, SND_ALIAS|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundA("C:\not_exist.wav", SND_FILENAME|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundW(not_existW, SND_FILENAME|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); +} + START_TEST(wave) { test_multiple_waveopens(); wave_out_tests(); + test_sndPlaySound(); }

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXANIMATIONCALLBACKHANDLER.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 1fb2d2c6a0781b22d25331ceb30b1e9e33eacd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb2d2c6a0781b22d25331ceb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:30 2012 +0100 d3dx9: Avoid LPD3DXANIMATIONCALLBACKHANDLER. --- include/d3dx9anim.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index f70faac..6806622 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -327,7 +327,7 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown) STDMETHOD_(UINT, GetNumAnimationSets)(THIS) PURE; STDMETHOD(GetAnimationSet)(THIS_ UINT index, LPD3DXANIMATIONSET *anim_set) PURE; STDMETHOD(GetAnimationSetByName)(THIS_ LPCSTR name, LPD3DXANIMATIONSET *anim_set) PURE; - STDMETHOD(AdvanceTime)(THIS_ DOUBLE time_delta, LPD3DXANIMATIONCALLBACKHANDLER *callback_handler) PURE; + STDMETHOD(AdvanceTime)(THIS_ double time_delta, ID3DXAnimationCallbackHandler **callback_handler) PURE; STDMETHOD(ResetTime)(THIS) PURE; STDMETHOD_(DOUBLE, GetTime)(THIS) PURE; STDMETHOD(SetTrackAnimationSet)(THIS_ UINT track, LPD3DXANIMATIONSET anim_set) PURE;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXKEYFRAMEDANIMATIONSET.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 4791dfe3a307bbb85baf32c273571556514066bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4791dfe3a307bbb85baf32c27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:31 2012 +0100 d3dx9: Avoid LPD3DXKEYFRAMEDANIMATIONSET. --- include/d3dx9anim.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 6806622..2cff387 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -391,7 +391,9 @@ LPD3DXFRAME WINAPI D3DXFrameFind(CONST D3DXFRAME*, LPCSTR); HRESULT WINAPI D3DXFrameRegisterNamedMatrices(D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller); UINT WINAPI D3DXFrameNumNamedMatrices(CONST D3DXFRAME *frame_root); HRESULT WINAPI D3DXFrameCalculateBoundingSphere(CONST D3DXFRAME*, LPD3DXVECTOR3, FLOAT*); -HRESULT WINAPI D3DXCreateKeyframedAnimationSet(LPCSTR, DOUBLE, D3DXPLAYBACK_TYPE, UINT, UINT, CONST D3DXKEY_CALLBACK*, LPD3DXKEYFRAMEDANIMATIONSET*); +HRESULT WINAPI D3DXCreateKeyframedAnimationSet(const char *name, double ticks_per_second, + D3DXPLAYBACK_TYPE playback_type, UINT animation_count, UINT callback_key_count, + const D3DXKEY_CALLBACK *callback_keys, ID3DXKeyframedAnimationSet **animation_set); HRESULT WINAPI D3DXCreateCompressedAnimationSet(const char *name, double ticks_per_second, D3DXPLAYBACK_TYPE playback_type, ID3DXBuffer *compressed_data, UINT callback_key_count, const D3DXKEY_CALLBACK *callback_keys, ID3DXCompressedAnimationSet **animation_set);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXANIMATIONSET.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 6b8dd67bef652ac4d2cf9c19dc22d6ab2e22eb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8dd67bef652ac4d2cf9c19d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:32 2012 +0100 d3dx9: Avoid LPD3DXANIMATIONSET. --- include/d3dx9anim.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 2cff387..5e9ef58 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -322,16 +322,16 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown) STDMETHOD_(UINT, GetMaxNumEvents)(THIS) PURE; STDMETHOD(RegisterAnimationOutput)(THIS_ LPCSTR name, D3DXMATRIX *matrix, D3DXVECTOR3 *scale, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) PURE; - STDMETHOD(RegisterAnimationSet)(THIS_ LPD3DXANIMATIONSET anim_set) PURE; - STDMETHOD(UnregisterAnimationSet)(THIS_ LPD3DXANIMATIONSET anim_set) PURE; + STDMETHOD(RegisterAnimationSet)(THIS_ ID3DXAnimationSet *anim_set) PURE; + STDMETHOD(UnregisterAnimationSet)(THIS_ ID3DXAnimationSet *anim_set) PURE; STDMETHOD_(UINT, GetNumAnimationSets)(THIS) PURE; - STDMETHOD(GetAnimationSet)(THIS_ UINT index, LPD3DXANIMATIONSET *anim_set) PURE; - STDMETHOD(GetAnimationSetByName)(THIS_ LPCSTR name, LPD3DXANIMATIONSET *anim_set) PURE; + STDMETHOD(GetAnimationSet)(THIS_ UINT index, ID3DXAnimationSet **anim_set) PURE; + STDMETHOD(GetAnimationSetByName)(THIS_ const char *name, ID3DXAnimationSet **anim_set) PURE; STDMETHOD(AdvanceTime)(THIS_ double time_delta, ID3DXAnimationCallbackHandler **callback_handler) PURE; STDMETHOD(ResetTime)(THIS) PURE; STDMETHOD_(DOUBLE, GetTime)(THIS) PURE; - STDMETHOD(SetTrackAnimationSet)(THIS_ UINT track, LPD3DXANIMATIONSET anim_set) PURE; - STDMETHOD(GetTrackAnimationSet)(THIS_ UINT track, LPD3DXANIMATIONSET *anim_set) PURE; + STDMETHOD(SetTrackAnimationSet)(THIS_ UINT track, ID3DXAnimationSet *anim_set) PURE; + STDMETHOD(GetTrackAnimationSet)(THIS_ UINT track, ID3DXAnimationSet **anim_set) PURE; STDMETHOD(GetTrackPriority)(THIS_ UINT track, D3DXPRIORITY_TYPE *priority) PURE; STDMETHOD(SetTrackSpeed)(THIS_ UINT track, FLOAT speed) PURE; STDMETHOD(SetTrackWeight)(THIS_ UINT track, FLOAT weight) PURE;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSSetConstantBuffers().
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: feda45279ee8bf77ac3440a77117474eec512711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feda45279ee8bf77ac3440a77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:33 2012 +0100 d3d10core: Implement d3d10_device_GSSetConstantBuffers(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 6 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 25439b0..fbebf9e 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -271,8 +271,19 @@ static void STDMETHODCALLTYPE d3d10_device_DrawInstanced(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); + + wined3d_device_set_gs_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device *iface, ID3D10GeometryShader *shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 57e1de9..6ea2f85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3129,6 +3129,45 @@ struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wi return device->stateBlock->state.geometry_shader; } +void CDECL wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +{ + struct wined3d_buffer *prev; + + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return; + } + + prev = device->updateStateBlock->state.gs_cb[idx]; + device->updateStateBlock->state.gs_cb[idx] = buffer; + + if (device->isRecordingState) + { + if (buffer) + wined3d_buffer_incref(buffer); + if (prev) + wined3d_buffer_decref(prev); + return; + } + + if (prev != buffer) + { + if (buffer) + { + InterlockedIncrement(&buffer->resource.bind_count); + wined3d_buffer_incref(buffer); + } + if (prev) + { + InterlockedDecrement(&prev->resource.bind_count); + wined3d_buffer_decref(prev); + } + } +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 11d8fa8..6499877 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -536,6 +536,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) + { + if ((buffer = state->gs_cb[i])) + { + state->gs_cb[i] = NULL; + wined3d_buffer_decref(buffer); + } + } + if ((shader = state->pixel_shader)) { state->pixel_shader = NULL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b7b04df..d08c33f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -116,6 +116,7 @@ @ cdecl wined3d_device_set_dialog_box_mode(ptr long) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) +@ cdecl wined3d_device_set_gs_cb(ptr long ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long) @ cdecl wined3d_device_set_light(ptr long ptr) @ cdecl wined3d_device_set_light_enable(ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ddf1fa2..4d7d456 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2306,6 +2306,7 @@ struct wined3d_state float *vs_consts_f; struct wined3d_shader *geometry_shader; + struct wined3d_buffer *gs_cb[MAX_CONSTANT_BUFFERS]; struct wined3d_shader *pixel_shader; BOOL ps_consts_b[MAX_CONST_B]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7b1e043..206c8ef 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2206,6 +2206,7 @@ HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSGetConstantBuffers().
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: d906c94382b9ace2c1206b6b3c2e63b2fb29a70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d906c94382b9ace2c1206b6b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:34 2012 +0100 d3d10core: Implement d3d10_device_GSGetConstantBuffers(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index fbebf9e..438beb0 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -669,8 +669,27 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetIndexBuffer(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_GSGetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_gs_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device *iface, ID3D10GeometryShader **shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6ea2f85..c293636 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3168,6 +3168,19 @@ void CDECL wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, str } } +struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return NULL; + } + + return device->stateBlock->state.gs_cb[idx]; +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d08c33f..c97e7af 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -66,6 +66,7 @@ @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) +@ cdecl wined3d_device_get_gs_cb(ptr long) @ cdecl wined3d_device_get_index_buffer(ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 206c8ef..82287df 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2127,6 +2127,7 @@ HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device,

1 0

Andrew Eikum : winealsa.drv: Improve IsFormatSupported handling.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 1d1aa7e8a14fe69aad145807d1f922b261a04b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1aa7e8a14fe69aad145807d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:27:56 2012 -0600 winealsa.drv: Improve IsFormatSupported handling. --- dlls/winealsa.drv/mmdevdrv.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 9275fbc..6d86f55 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1230,6 +1230,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if( duration < 3 * period) duration = 3 * period; }else{ + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + if(!period) period = DefaultPeriod; /* not minimum */ if(period < MinimumPeriod || period > 5000000) @@ -1587,6 +1593,15 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, out = NULL; } + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmt->nAvgBytesPerSec == 0 || + fmt->nBlockAlign == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample > fmt->wBitsPerSample)) + return E_INVALIDARG; + + if(fmt->nChannels == 0) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + EnterCriticalSection(&This->lock); if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ @@ -1664,6 +1679,19 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = get_channel_mask(closest->nChannels); + if(fmt->nBlockAlign != fmt->nChannels * fmt->wBitsPerSample / 8 || + fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample < fmt->wBitsPerSample)) + hr = S_FALSE; + + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && + fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) + hr = S_FALSE; + } + exit: LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, formats); @@ -1676,6 +1704,8 @@ exit: closest->nChannels * closest->wBitsPerSample / 8; closest->nAvgBytesPerSec = closest->nBlockAlign * closest->nSamplesPerSec; + if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + ((WAVEFORMATEXTENSIBLE*)closest)->Samples.wValidBitsPerSample = closest->wBitsPerSample; *out = closest; } else CoTaskMemFree(closest);

1 0

Andrew Eikum : winecoreaudio.drv: Convert some OSStatus errors to HRESULT.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: e84f05bcbcbf2092b8c09f6440cc951b66285af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84f05bcbcbf2092b8c09f644… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:28:02 2012 -0600 winecoreaudio.drv: Convert some OSStatus errors to HRESULT. --- dlls/winecoreaudio.drv/mmdevdrv.c | 45 ++++++++++++++++++++++++------------ 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index da0123b..06f46f7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -55,6 +55,7 @@ #include <libkern/OSAtomic.h> #include <CoreAudio/CoreAudio.h> #include <AudioToolbox/AudioQueue.h> +#include <AudioToolbox/AudioFormat.h> WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); @@ -281,6 +282,19 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } +static HRESULT osstatus_to_hresult(OSStatus sc) +{ + switch(sc){ + case kAudioFormatUnsupportedDataFormatError: + case kAudioFormatUnknownFormatError: + case kAudioDeviceUnsupportedFormatError: + return AUDCLNT_E_UNSUPPORTED_FORMAT; + case kAudioHardwareBadDeviceError: + return AUDCLNT_E_DEVICE_INVALIDATED; + } + return E_FAIL; +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -390,7 +404,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, NULL, &devsize); if(sc != noErr){ WARN("Getting _Devices property size failed: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } devices = HeapAlloc(GetProcessHeap(), 0, devsize); @@ -402,7 +416,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, if(sc != noErr){ WARN("Getting _Devices property failed: %lx\n", sc); HeapFree(GetProcessHeap(), 0, devices); - return E_FAIL; + return osstatus_to_hresult(sc); } ndevices = devsize / sizeof(AudioDeviceID); @@ -959,7 +973,7 @@ static HRESULT ca_setup_aqueue(AudioDeviceID did, EDataFlow flow, sc = AudioObjectGetPropertyData(did, &addr, 0, NULL, &size, &uid); if(sc != noErr){ WARN("Unable to get _DeviceUID property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } hr = ca_get_audiodesc(&desc, fmt); @@ -981,14 +995,15 @@ static HRESULT ca_setup_aqueue(AudioDeviceID did, EDataFlow flow, if(sc != noErr){ WARN("Unable to create AudioQueue: %lx\n", sc); CFRelease(uid); - return E_FAIL; + return osstatus_to_hresult(sc); } sc = AudioQueueSetProperty(*aqueue, kAudioQueueProperty_CurrentDevice, &uid, sizeof(uid)); if(sc != noErr){ + WARN("Unable to change AQueue device: %lx\n", sc); CFRelease(uid); - return E_FAIL; + return osstatus_to_hresult(sc); } CFRelease(uid); @@ -1183,7 +1198,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->fmt = NULL; OSSpinLockUnlock(&This->lock); WARN("Couldn't allocate buffer: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } buf->buf->mUserData = buf; @@ -1280,7 +1295,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) &size); if(sc != noErr){ WARN("Unable to get size for _Streams property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } ids = HeapAlloc(GetProcessHeap(), 0, size); @@ -1291,7 +1306,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) if(sc != noErr){ WARN("Unable to get _Streams property: %lx\n", sc); HeapFree(GetProcessHeap(), 0, ids); - return E_FAIL; + return osstatus_to_hresult(sc); } nstreams = size / sizeof(AudioStreamID); @@ -1349,7 +1364,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, if(sc != noErr){ WARN("Couldn't get _Latency property: %lx\n", sc); OSSpinLockUnlock(&This->lock); - return E_FAIL; + return osstatus_to_hresult(sc); } hr = ca_get_max_stream_latency(This, &stream_latency); @@ -1486,7 +1501,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(sc != noErr){ CoTaskMemFree(fmt); WARN("Unable to get size for _StreamConfiguration property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } buffers = HeapAlloc(GetProcessHeap(), 0, size); @@ -1501,7 +1516,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, CoTaskMemFree(fmt); HeapFree(GetProcessHeap(), 0, buffers); WARN("Unable to get _StreamConfiguration property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } fmt->Format.nChannels = 0; @@ -1518,7 +1533,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(sc != noErr){ CoTaskMemFree(fmt); WARN("Unable to get _NominalSampleRate property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } fmt->Format.nSamplesPerSec = rate; @@ -1609,7 +1624,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) if(sc != noErr){ OSSpinLockUnlock(&This->lock); WARN("Unable to start audio queue: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } This->playing = StatePlaying; @@ -1672,7 +1687,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) if(sc != noErr){ OSSpinLockUnlock(&This->lock); WARN("Unable to pause audio queue: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } This->playing = StateStopped; @@ -1724,7 +1739,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) if(sc != noErr){ OSSpinLockUnlock(&This->lock); WARN("Unable to reset audio queue: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } /* AQReset is synchronous */

1 0