April 2010 - Wine-Commits - list.winehq.org

Wolfram Sang : user32: Ignore reserved bytes in BMP fileheader.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 94a3c0987e2765a4eed0a6dcba37dc45ca3d7dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a3c0987e2765a4eed0a6dcb… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Mon Apr 26 01:13:37 2010 +0200 user32: Ignore reserved bytes in BMP fileheader. --- dlls/user32/cursoricon.c | 4 +--- dlls/user32/tests/cursoricon.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7035c1b..0d74276 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2486,9 +2486,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (!(ptr = map_fileW( name, NULL ))) return 0; info = (BITMAPINFO *)(ptr + sizeof(BITMAPFILEHEADER)); bmfh = (BITMAPFILEHEADER *)ptr; - if (!( bmfh->bfType == 0x4d42 /* 'BM' */ && - bmfh->bfReserved1 == 0 && - bmfh->bfReserved2 == 0)) + if (bmfh->bfType != 0x4d42 /* 'BM' */) { WARN("Invalid/unsupported bitmap format!\n"); UnmapViewOfFile( ptr ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index eb22ce4..c1da70d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -700,7 +700,7 @@ static const unsigned char pngimage[285] = { /* 1x1 pixel bmp */ static const unsigned char bmpimage[66] = { -0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, +0x42,0x4d,0x42,0x00,0x00,0x00,0xDE,0xAD,0xBE,0xEF,0x3e,0x00,0x00,0x00,0x28,0x00, 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, 0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00,

1 0

Kirill Smelkov : winegcc: Do use DSO full name for .so arguments.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: b25cd21df2d87f590d5bcff7ebc368dec43730bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25cd21df2d87f590d5bcff7e… Author: Kirill Smelkov <kirr(a)mns.spb.ru> Date: Fri Apr 23 12:55:28 2010 +0400 winegcc: Do use DSO full name for .so arguments. --- tools/winegcc/winegcc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b7c0f91..10a4d7a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -739,10 +739,10 @@ static void build(struct options* opts) switch(files->base[j][1]) { case 'l': - case 's': case 'd': strarray_add(link_args, strmake("-l%s", name)); break; + case 's': case 'o': strarray_add(link_args, name); break; @@ -922,9 +922,9 @@ static void build(struct options* opts) switch(files->base[j][1]) { case 'l': - case 's': strarray_add(link_args, strmake("-l%s", name)); break; + case 's': case 'a': case 'o': strarray_add(link_args, name);

1 0

Maarten Lankhorst : winmm: Fix handle leak in timer tests.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 963102fd89ebe134bc1d155e0810c717796385ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=963102fd89ebe134bc1d155e0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 24 08:07:28 2010 +0200 winmm: Fix handle leak in timer tests. --- dlls/winmm/tests/timer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/timer.c b/dlls/winmm/tests/timer.c index 7ac86b9..be63f6b 100644 --- a/dlls/winmm/tests/timer.c +++ b/dlls/winmm/tests/timer.c @@ -190,6 +190,7 @@ static void test_priority(void) "thread priority is %s, should be THREAD_PRIORITY_TIME_CRITICAL\n", get_priority(priority)); } + timeKillEvent(id); } START_TEST(timer)

1 0

Vincent Povirk : gdiplus: Handle more cases in GdipCreateBitmapFromGdiDib.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 38138784e7ae943155eadfd9af8d2c4639694013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38138784e7ae943155eadfd9a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 24 09:39:23 2010 -0500 gdiplus: Handle more cases in GdipCreateBitmapFromGdiDib. --- dlls/gdiplus/image.c | 6 ++++++ dlls/gdiplus/tests/image.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b0ba8ce..56b79e1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1242,9 +1242,15 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO* info, case 8: format = PixelFormat8bppIndexed; break; + case 16: + format = PixelFormat16bppRGB555; + break; case 24: format = PixelFormat24bppRGB; break; + case 32: + format = PixelFormat32bppRGB; + break; default: FIXME("don't know how to handle %d bpp\n", info->bmiHeader.biBitCount); *bitmap = NULL; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cf2a6e1..09ba8f0 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -188,8 +188,8 @@ static void test_FromGdiDib(void) expect(InvalidParameter, stat); stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); - todo_wine expect(Ok, stat); - todo_wine ok(NULL != bm, "Expected bitmap to be initialized\n"); + expect(Ok, stat); + ok(NULL != bm, "Expected bitmap to be initialized\n"); if (stat == Ok) { stat = GdipGetImagePixelFormat((GpImage*)bm, &format); @@ -214,8 +214,8 @@ static void test_FromGdiDib(void) bmi->bmiHeader.biBitCount = 16; stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); - todo_wine expect(Ok, stat); - todo_wine ok(NULL != bm, "Expected bitmap to be initialized\n"); + expect(Ok, stat); + ok(NULL != bm, "Expected bitmap to be initialized\n"); if (stat == Ok) { stat = GdipGetImagePixelFormat((GpImage*)bm, &format);

1 0

André Hentschel : shell32: Return boolean values.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: c9a78f7e62e7daf50077ae2f3f58cc6e9b15b76d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a78f7e62e7daf50077ae2f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 23 14:19:09 2010 +0200 shell32: Return boolean values. --- dlls/shell32/pidl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 99bbed8..6f4b082 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -218,9 +218,9 @@ BOOL WINAPI ILRemoveLastID(LPITEMIDLIST pidl) TRACE_(shell)("pidl=%p\n",pidl); if (!pidl || !pidl->mkid.cb) - return 0; + return FALSE; ILFindLastID(pidl)->mkid.cb = 0; - return 1; + return TRUE; } /************************************************************************* @@ -1674,7 +1674,7 @@ BOOL _ILIsDesktop(LPCITEMIDLIST pidl) { TRACE("(%p)\n",pidl); - return pidl && pidl->mkid.cb ? 0 : 1; + return pidl && pidl->mkid.cb ? FALSE : TRUE; } BOOL _ILIsMyComputer(LPCITEMIDLIST pidl)

1 0

Vincent Povirk : gdiplus: Add test for GdipCreateBitmapFromGdiDib.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 800e9ff6c541b3708f8e460cf3218397a84ea6a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=800e9ff6c541b3708f8e460cf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 24 09:37:51 2010 -0500 gdiplus: Add test for GdipCreateBitmapFromGdiDib. --- dlls/gdiplus/image.c | 3 + dlls/gdiplus/tests/image.c | 112 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0a73dcf..b0ba8ce 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1220,6 +1220,9 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO* info, FIXME("(%p, %p, %p) - partially implemented\n", info, bits, bitmap); + if (!info || !bits || !bitmap) + return InvalidParameter; + height = abs(info->bmiHeader.biHeight); stride = ((info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) >> 3) & ~3; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 74e6ee1..cf2a6e1 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -158,6 +158,117 @@ static void test_Scan0(void) ok( !bm, "expected null bitmap\n" ); } +static void test_FromGdiDib(void) +{ + GpBitmap *bm; + GpStatus stat; + BYTE buff[400]; + BYTE rbmi[sizeof(BITMAPINFOHEADER)+256*sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO*)rbmi; + PixelFormat format; + + bm = NULL; + + memset(rbmi, 0, sizeof(rbmi)); + + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biWidth = 10; + bmi->bmiHeader.biHeight = 10; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biCompression = BI_RGB; + + stat = GdipCreateBitmapFromGdiDib(NULL, buff, &bm); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGdiDib(bmi, NULL, &bm); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGdiDib(bmi, buff, NULL); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); + todo_wine expect(Ok, stat); + todo_wine ok(NULL != bm, "Expected bitmap to be initialized\n"); + if (stat == Ok) + { + stat = GdipGetImagePixelFormat((GpImage*)bm, &format); + expect(Ok, stat); + expect(PixelFormat32bppRGB, format); + + GdipDisposeImage((GpImage*)bm); + } + + bmi->bmiHeader.biBitCount = 24; + stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); + expect(Ok, stat); + ok(NULL != bm, "Expected bitmap to be initialized\n"); + if (stat == Ok) + { + stat = GdipGetImagePixelFormat((GpImage*)bm, &format); + expect(Ok, stat); + expect(PixelFormat24bppRGB, format); + + GdipDisposeImage((GpImage*)bm); + } + + bmi->bmiHeader.biBitCount = 16; + stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); + todo_wine expect(Ok, stat); + todo_wine ok(NULL != bm, "Expected bitmap to be initialized\n"); + if (stat == Ok) + { + stat = GdipGetImagePixelFormat((GpImage*)bm, &format); + expect(Ok, stat); + expect(PixelFormat16bppRGB555, format); + + GdipDisposeImage((GpImage*)bm); + } + + bmi->bmiHeader.biBitCount = 8; + stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); + expect(Ok, stat); + ok(NULL != bm, "Expected bitmap to be initialized\n"); + if (stat == Ok) + { + stat = GdipGetImagePixelFormat((GpImage*)bm, &format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, format); + + GdipDisposeImage((GpImage*)bm); + } + + bmi->bmiHeader.biBitCount = 4; + stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); + expect(Ok, stat); + ok(NULL != bm, "Expected bitmap to be initialized\n"); + if (stat == Ok) + { + stat = GdipGetImagePixelFormat((GpImage*)bm, &format); + expect(Ok, stat); + expect(PixelFormat4bppIndexed, format); + + GdipDisposeImage((GpImage*)bm); + } + + bmi->bmiHeader.biBitCount = 1; + stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); + expect(Ok, stat); + ok(NULL != bm, "Expected bitmap to be initialized\n"); + if (stat == Ok) + { + stat = GdipGetImagePixelFormat((GpImage*)bm, &format); + expect(Ok, stat); + expect(PixelFormat1bppIndexed, format); + + GdipDisposeImage((GpImage*)bm); + } + + bmi->bmiHeader.biBitCount = 0; + stat = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); + expect(InvalidParameter, stat); +} + static void test_GetImageDimension(void) { GpBitmap *bm; @@ -1901,6 +2012,7 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_Scan0(); + test_FromGdiDib(); test_GetImageDimension(); test_GdipImageGetFrameDimensionsCount(); test_LoadingImages();

1 0

Detlef Riekenberg : msvcr70/71: Sync exports to msvcrt.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 1d4933959096dcd7625a4260cc0a9b5b15254931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4933959096dcd7625a4260c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 23 14:03:34 2010 +0200 msvcr70/71: Sync exports to msvcrt. --- dlls/msvcr70/msvcr70.spec | 12 ++++++------ dlls/msvcr71/msvcr71.spec | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 102b6db..b5934fa 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -108,7 +108,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW -@ stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ stub __crtLCMapStringW @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @@ -233,7 +233,7 @@ @ extern _ctype msvcrt._ctype @ cdecl _cwait(ptr long long) msvcrt._cwait @ stub _cwprintf -@ stub _cwscanf +@ varargs _cwscanf(wstr) msvcrt._cwscanf @ extern _daylight msvcrt._daylight @ extern _dstbias msvcrt._dstbias @ cdecl _dup(long) msvcrt._dup @@ -268,10 +268,10 @@ @ cdecl _fileno(ptr) msvcrt._fileno @ cdecl _findclose(long) msvcrt._findclose @ cdecl _findfirst(str ptr) msvcrt._findfirst -@ stub _findfirst64 +@ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirsti64(str ptr) msvcrt._findfirsti64 @ cdecl _findnext(long ptr) msvcrt._findnext -@ stub _findnext64 +@ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnexti64(long ptr) msvcrt._findnexti64 @ cdecl _finite( double ) msvcrt._finite @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @@ -522,8 +522,8 @@ @ cdecl _strrev(str) msvcrt._strrev @ cdecl _strset(str long) msvcrt._strset @ cdecl _strtime(ptr) msvcrt._strtime -@ stub _strtoi64 -@ stub _strtoui64 +@ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 +@ cdecl _strtoui64(str ptr long) msvcrt._strtoui64 @ cdecl _strupr(str) msvcrt._strupr @ cdecl _swab(str str long) msvcrt._swab @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index c16de92..8012cfd 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -103,7 +103,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtGetLocaleInfoW(long long ptr long) -@ stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ stub __crtLCMapStringW @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @@ -227,7 +227,7 @@ @ cdecl _ctime64(ptr) msvcrt._ctime64 @ cdecl _cwait(ptr long long) msvcrt._cwait @ stub _cwprintf -@ stub _cwscanf +@ varargs _cwscanf(wstr) msvcrt._cwscanf @ extern _daylight msvcrt._daylight @ extern _dstbias msvcrt._dstbias @ cdecl _dup(long) msvcrt._dup @@ -262,10 +262,10 @@ @ cdecl _fileno(ptr) msvcrt._fileno @ cdecl _findclose(long) msvcrt._findclose @ cdecl _findfirst(str ptr) msvcrt._findfirst -@ stub _findfirst64 +@ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirsti64(str ptr) msvcrt._findfirsti64 @ cdecl _findnext(long ptr) msvcrt._findnext -@ stub _findnext64 +@ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnexti64(long ptr) msvcrt._findnexti64 @ cdecl _finite( double ) msvcrt._finite @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @@ -287,7 +287,7 @@ @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _futime64(long ptr) msvcrt._futime64 @ cdecl _gcvt(double long str) msvcrt._gcvt -@ stub _get_heap_handle +@ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @ cdecl _getch() msvcrt._getch @@ -518,8 +518,8 @@ @ cdecl _strrev(str) msvcrt._strrev @ cdecl _strset(str long) msvcrt._strset @ cdecl _strtime(ptr) msvcrt._strtime -@ stub _strtoi64 -@ stub _strtoui64 +@ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 +@ cdecl _strtoui64(str ptr long) msvcrt._strtoui64 @ cdecl _strupr(str) msvcrt._strupr @ cdecl _swab(str str long) msvcrt._swab @ extern _sys_errlist msvcrt._sys_errlist

1 0

Kirill Smelkov : winebuild/winegcc: Allow building .dll.so without . spec file.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 0b4fe5e56a1e324bcfb4a03a5b0acd1f0e97da79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4fe5e56a1e324bcfb4a03a5… Author: Kirill Smelkov <kirr(a)mns.spb.ru> Date: Fri Apr 23 12:55:27 2010 +0400 winebuild/winegcc: Allow building .dll.so without .spec file. --- tools/winebuild/main.c | 1 - tools/winegcc/winegcc.c | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index d2ec943..0e662f8 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -621,7 +621,6 @@ int main(int argc, char **argv) case MODE_DLL: if (spec->subsystem != IMAGE_SUBSYSTEM_NATIVE) spec->characteristics |= IMAGE_FILE_DLL; - if (!spec_file_name) fatal_error( "missing .spec file\n" ); /* fall through */ case MODE_EXE: load_resources( argv, spec ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 48f39bc..b7c0f91 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -674,8 +674,6 @@ static void build(struct options* opts) else if (file[1] == 'x') lang = file; } - if (opts->shared && !spec_file) - error("A spec file is currently needed in shared mode\n"); /* building for Windows is completely different */

1 0

Maarten Lankhorst : mmdevapi: Fix IsFormatSupported and initialization.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 61d78d46c77c8b9d664f529efcabfaa43f8126b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d78d46c77c8b9d664f529ef… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 22 22:59:59 2010 +0200 mmdevapi: Fix IsFormatSupported and initialization. --- dlls/mmdevapi/audio.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 2781125..2d19c05 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -473,8 +473,10 @@ static HRESULT WINAPI AC_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, hr = IAudioClient_IsFormatSupported(iface, mode, pwfx, &pwfx2); CoTaskMemFree(pwfx2); - if (FAILED(hr) || pwfx2) + if (FAILED(hr) || pwfx2) { + WARN("Format not supported, or had to be modified!\n"); return AUDCLNT_E_UNSUPPORTED_FORMAT; + } EnterCriticalSection(This->crst); HeapFree(GetProcessHeap(), 0, This->pwfx); This->pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(*pwfx) + pwfx->cbSize); @@ -483,6 +485,21 @@ static HRESULT WINAPI AC_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, goto out; } memcpy(This->pwfx, pwfx, sizeof(*pwfx) + pwfx->cbSize); + if (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { + WAVEFORMATEXTENSIBLE *wfe = (WAVEFORMATEXTENSIBLE *)This->pwfx; + switch (pwfx->nChannels) { + case 1: wfe->dwChannelMask = MONO; break; + case 2: wfe->dwChannelMask = STEREO; break; + case 4: wfe->dwChannelMask = QUAD; break; + case 6: wfe->dwChannelMask = X5DOT1; break; + case 7: wfe->dwChannelMask = X6DOT1; break; + case 8: wfe->dwChannelMask = X7DOT1; break; + default: + ERR("How did we end up with %i channels?\n", pwfx->nChannels); + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + goto out; + } + } hr = IAudioClient_GetDevicePeriod(iface, &time, NULL); if (FAILED(hr)) @@ -665,6 +682,9 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) static HRESULT WINAPI AC_IsFormatSupported(IAudioClient *iface, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx, WAVEFORMATEX **outpwfx) { ACImpl *This = (ACImpl*)iface; + WAVEFORMATEX *tmp; + DWORD mask; + DWORD size; TRACE("(%p)->(%x,%p,%p)\n", This, mode, pwfx, outpwfx); if (!pwfx) return E_POINTER; @@ -676,9 +696,14 @@ static HRESULT WINAPI AC_IsFormatSupported(IAudioClient *iface, AUDCLNT_SHAREMOD WARN("Unknown mode %x\n", mode); return E_INVALIDARG; } - if (pwfx->wFormatTag != WAVE_FORMAT_EXTENSIBLE - && pwfx->wFormatTag != WAVE_FORMAT_PCM) + + if (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + size = sizeof(WAVEFORMATEXTENSIBLE); + else if (pwfx->wFormatTag == WAVE_FORMAT_PCM) + size = sizeof(WAVEFORMATEX); + else return AUDCLNT_E_UNSUPPORTED_FORMAT; + if (pwfx->nSamplesPerSec < 8000 || pwfx->nSamplesPerSec > 192000) return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -687,8 +712,49 @@ static HRESULT WINAPI AC_IsFormatSupported(IAudioClient *iface, AUDCLNT_SHAREMOD if (pwfx->wBitsPerSample > 16) return AUDCLNT_E_UNSUPPORTED_FORMAT; } + + switch (pwfx->nChannels) { + case 1: mask = MONO; break; + case 2: mask = STEREO; break; + case 4: mask = QUAD; break; + case 6: mask = X5DOT1; break; + case 7: mask = X6DOT1; break; + case 8: mask = X7DOT1; break; + default: + TRACE("Unsupported channel count %i\n", pwfx->nChannels); + return AUDCLNT_E_UNSUPPORTED_FORMAT;; + } + tmp = CoTaskMemAlloc(size); + if (outpwfx) + *outpwfx = tmp; + if (!tmp) + return E_OUTOFMEMORY; + + memcpy(tmp, pwfx, size); + tmp->nBlockAlign = tmp->nChannels * tmp->wBitsPerSample / 8; + tmp->nAvgBytesPerSec = tmp->nBlockAlign * tmp->nSamplesPerSec; + tmp->cbSize = size - sizeof(WAVEFORMATEX); + if (tmp->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { + WAVEFORMATEXTENSIBLE *ex = (WAVEFORMATEXTENSIBLE*)tmp; + + if (ex->Samples.wValidBitsPerSample) + ex->Samples.wValidBitsPerSample = ex->Format.wBitsPerSample; + + /* Rear is a special allowed case */ + if (ex->dwChannelMask + && !(ex->Format.nChannels == 2 && ex->dwChannelMask == REAR)) + ex->dwChannelMask = mask; + } + + if (memcmp(pwfx, tmp, size)) { + if (outpwfx) + return S_FALSE; + CoTaskMemFree(tmp); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } if (outpwfx) *outpwfx = NULL; + CoTaskMemFree(tmp); return S_OK; }

1 0

Maarten Lankhorst : mmdevapi: Silence a fixme when it's harmless.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 8bd65c143f587866af70f0760e44e87dd50bfc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd65c143f587866af70f0760… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 24 07:55:06 2010 +0200 mmdevapi: Silence a fixme when it's harmless. --- dlls/mmdevapi/audio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 2d19c05..b166d81 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -1107,7 +1107,8 @@ static HRESULT WINAPI ACR_ReleaseBuffer(IAudioRenderClient *iface, UINT32 writte return E_INVALIDARG; if (!written) { - FIXME("Handled right?\n"); + if (This->parent->locked) + FIXME("Handled right?\n"); This->parent->locked = 0; return S_OK; }

1 0