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

Carlo Bramini : include: mimeole.idl: Fix typo in ADDRESSPROPS structure.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 8e4acd81aaf6a2e413391606c1e8c67479567007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e4acd81aaf6a2e413391606c… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Mon Apr 2 22:19:37 2012 +0200 include: mimeole.idl: Fix typo in ADDRESSPROPS structure. --- include/mimeole.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index d74cdb5..ab1239f 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -611,7 +611,7 @@ cpp_quote("#endif") DWORD dwCookie; DWORD dwReserved1; DWORD dwReserved2; - } ADRESSPROPS, *LPADDRESSPROPS; + } ADDRESSPROPS, *LPADDRESSPROPS; typedef struct tagADDRESSLIST {

1 0

Alexandre Julliard : winex11: Fix a potential deadlock in the GradientFill non-XRender fallback.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 46390b09d5dccce6704208ea62cbf53e29e0ce90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46390b09d5dccce6704208ea6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 22:21:22 2012 +0200 winex11: Fix a potential deadlock in the GradientFill non-XRender fallback. --- dlls/winex11.drv/graphics.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index afe2ff1..e78cd74 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1446,11 +1446,13 @@ BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, } for (x = 0, pos = min( pt[0].x, pt[1].x ); x < dx; x++, pos++) { - COLORREF color = RGB( (v[0].Red * (dx - x) + v[1].Red * x) / dx / 256, + int color = X11DRV_PALETTE_ToPhysical( physdev, + RGB( (v[0].Red * (dx - x) + v[1].Red * x) / dx / 256, (v[0].Green * (dx - x) + v[1].Green * x) / dx / 256, - (v[0].Blue * (dx - x) + v[1].Blue * x) / dx / 256); + (v[0].Blue * (dx - x) + v[1].Blue * x) / dx / 256) ); + wine_tsx11_lock(); - XSetForeground( gdi_display, physdev->gc, X11DRV_PALETTE_ToPhysical( physdev, color )); + XSetForeground( gdi_display, physdev->gc, color ); XDrawLine( gdi_display, physdev->drawable, physdev->gc, physdev->dc_rect.left + pos, physdev->dc_rect.top + pt[0].y, physdev->dc_rect.left + pos, physdev->dc_rect.top + pt[1].y ); @@ -1491,11 +1493,13 @@ BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, } for (y = 0, pos = min( pt[0].y, pt[1].y ); y < dy; y++, pos++) { - COLORREF color = RGB( (v[0].Red * (dy - y) + v[1].Red * y) / dy / 256, + int color = X11DRV_PALETTE_ToPhysical( physdev, + RGB( (v[0].Red * (dy - y) + v[1].Red * y) / dy / 256, (v[0].Green * (dy - y) + v[1].Green * y) / dy / 256, - (v[0].Blue * (dy - y) + v[1].Blue * y) / dy / 256); + (v[0].Blue * (dy - y) + v[1].Blue * y) / dy / 256) ); + wine_tsx11_lock(); - XSetForeground( gdi_display, physdev->gc, X11DRV_PALETTE_ToPhysical( physdev, color )); + XSetForeground( gdi_display, physdev->gc, color ); XDrawLine( gdi_display, physdev->drawable, physdev->gc, physdev->dc_rect.left + pt[0].x, physdev->dc_rect.top + pos, physdev->dc_rect.left + pt[1].x, physdev->dc_rect.top + pos );

1 0

Michael Stefaniuc : devenum: COM cleanup for ICreateDevEnum.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 1e40dea125b3361c28a6c87f298a49cac8f9cbb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e40dea125b3361c28a6c87f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:15:31 2012 +0200 devenum: COM cleanup for ICreateDevEnum. --- dlls/devenum/createdevenum.c | 18 +++++++++--------- dlls/devenum/devenum_private.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 615305d..266e1d8 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -59,24 +59,24 @@ static HRESULT DEVENUM_CreateSpecialCategories(void); /********************************************************************** * DEVENUM_ICreateDevEnum_QueryInterface (also IUnknown) */ -static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface( - ICreateDevEnum * iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(ICreateDevEnum *iface, REFIID riid, + void **ppv) { TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); - if (ppvObj == NULL) return E_POINTER; + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ICreateDevEnum)) { - *ppvObj = iface; + *ppv = iface; DEVENUM_ICreateDevEnum_AddRef(iface); return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -463,9 +463,9 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( HKEY hkey; HKEY hbasekey; HRESULT hr; - CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface; - TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); + TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", iface, debugstr_guid(clsidDeviceClass), + ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); if (!ppEnumMoniker) return E_POINTER; @@ -519,7 +519,7 @@ static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl = /********************************************************************** * static CreateDevEnum instance */ -CreateDevEnumImpl DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; +CreateDevEnumImpl DEVENUM_CreateDevEnum = { { &ICreateDevEnum_Vtbl } }; /********************************************************************** * DEVENUM_CreateAMCategoryKey (INTERNAL) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 7515877..0c1800e 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -62,7 +62,7 @@ typedef struct typedef struct { - const ICreateDevEnumVtbl *lpVtbl; + ICreateDevEnum ICreateDevEnum_iface; } CreateDevEnumImpl; typedef struct

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DDevice9Impl_QueryInterface ().
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: f47267ad55214784f9cb63f117283c87b6d64dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47267ad55214784f9cb63f11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 2 22:42:22 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DDevice9Impl_QueryInterface(). --- dlls/d3d9/device.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ab96d79..bec3c4b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -186,38 +186,39 @@ static inline IDirect3DDevice9Impl *impl_from_IDirect3DDevice9Ex(IDirect3DDevice return CONTAINING_RECORD(iface, IDirect3DDevice9Impl, IDirect3DDevice9Ex_iface); } -static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, - void **ppobj) +static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DDevice9)) { + if (IsEqualGUID(riid, &IID_IDirect3DDevice9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DDevice9Ex_AddRef(iface); - *ppobj = This; - TRACE("Returning IDirect3DDevice9 interface at %p\n", *ppobj); + *out = iface; return S_OK; - } else if(IsEqualGUID(riid, &IID_IDirect3DDevice9Ex)) { + } + + if (IsEqualGUID(riid, &IID_IDirect3DDevice9Ex)) + { + IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); + /* Find out if the creating d3d9 interface was created with Direct3DCreate9Ex. * It doesn't matter with which function the device was created. */ - - if (This->d3d_parent->extended) + if (!device->d3d_parent->extended) { - *ppobj = iface; - IDirect3DDevice9Ex_AddRef((IDirect3DDevice9Ex *) *ppobj); - TRACE("Returning IDirect3DDevice9Ex interface at %p\n", *ppobj); - return S_OK; - } else { - WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE\n"); - *ppobj = NULL; + WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE.\n"); + *out = NULL; return E_NOINTERFACE; } + + IDirect3DDevice9Ex_AddRef(iface); + *out = iface; + return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); - *ppobj = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : ddraw: Surface versions before 7 return E_INVALIDARG on failure in QueryInterface ().
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: ecd1c78c4820c0892b0e7cbe431ae52ceadb4bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd1c78c4820c0892b0e7cbe4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 2 22:42:20 2012 +0200 ddraw: Surface versions before 7 return E_INVALIDARG on failure in QueryInterface(). --- dlls/ddraw/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f2c707a..d5b57c0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -239,6 +239,9 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + if (This->version != 7) + return E_INVALIDARG; + return E_NOINTERFACE; }

1 0

Lucas Fialho Zawacki : Add Portuguese translation for release 1.5.1
by Jeremy Newman April 2, 2012

April 2, 2012

Module: website Branch: master Commit: 37bd11551fd7364d52a37f17907636b15d7faad2 URL: http://source.winehq.org/git/website.git/?a=commit;h=37bd11551fd7364d52a37f… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Apr 2 16:38:13 2012 -0300 Add Portuguese translation for release 1.5.1 --- news/pt/2012033001.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2012033001.xml b/news/pt/2012033001.xml new file mode 100644 index 0000000..7e091a2 --- /dev/null +++ b/news/pt/2012033001.xml @@ -0,0 +1,16 @@ +<news> +<date>30 de Março de 2012</date> +<title>Wine 1.5.1 lançado</title> +<body> + A versão de desenvolvimento 1.5.1 já está disponível. + <a href="{$root}/announce/1.5.1">Novidades</a> nesta versão: +<ul> + <li>Javascript built-in agora tem preferência ao Gecko na maioria dos casos.</li> + <li>Suporte a fontes redimensionáveis em recursos.</li> + <li>Correções na reprodução de vídeo e áudio.</li> + <li>Suporte a decodificação de scripts em JScript.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.1.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Christian Costa : d3drm: Implement CreateMesh method and stubbed IDirect3DRMMesh interface.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: bd484dca069f0ed997ed142f638194d003a975ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd484dca069f0ed997ed142f6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 30 00:50:33 2012 +0200 d3drm: Implement CreateMesh method and stubbed IDirect3DRMMesh interface. --- dlls/d3drm/meshbuilder.c | 398 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 394 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd484dca069f0ed997ed1…

1 0

Dmitry Timoshkov : user32: SetParent() should use ShowWindow() to make a reparented window visible and move a window to new position.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 847317d01983eed51a93ef57390fb6a266091b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=847317d01983eed51a93ef573… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 23 16:57:28 2012 +0800 user32: SetParent() should use ShowWindow() to make a reparented window visible and move a window to new position. --- dlls/user32/win.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3e7d9b1..1cad8aa 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2787,6 +2787,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) HWND old_parent = 0; BOOL was_visible; WND *wndPtr; + POINT pt; BOOL ret; if (is_broadcast(hwnd) || is_broadcast(parent)) @@ -2828,6 +2829,9 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return 0; + pt.x = wndPtr->rectWindow.left; + pt.y = wndPtr->rectWindow.top; + SERVER_START_REQ( set_parent ) { req->handle = wine_server_user_handle( hwnd ); @@ -2849,10 +2853,9 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) in the x-order and send the expected WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED notification messages. */ - SetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | (was_visible ? SWP_SHOWWINDOW : 0) ); - /* FIXME: a WM_MOVE is also generated (in the DefWindowProc handler - * for WM_WINDOWPOSCHANGED) in Windows, should probably remove SWP_NOMOVE */ + SetWindowPos( hwnd, HWND_TOP, pt.x, pt.y, 0, 0, SWP_NOSIZE ); + + if (was_visible) ShowWindow( hwnd, SW_SHOW ); return old_parent; }

1 0

Dmitry Timoshkov : user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE .
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 38a76ecb0386d37d30b06b7947ed52be77ec9f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a76ecb0386d37d30b06b794… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 23 16:58:13 2012 +0800 user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE. --- dlls/user32/winpos.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 42f6b3e..c4b61a8 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1849,6 +1849,7 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) { HWND parent; RECT window_rect; + POINT pt; WND *wndPtr = WIN_GetPtr( winpos->hwnd ); BOOL ret = TRUE; @@ -1880,12 +1881,15 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) if (!(winpos->flags & SWP_SHOWWINDOW)) winpos->flags |= SWP_NOREDRAW; } - WIN_GetRectangles( winpos->hwnd, COORDS_PARENT, &window_rect, NULL ); + WIN_GetRectangles( winpos->hwnd, COORDS_SCREEN, &window_rect, NULL ); if ((window_rect.right - window_rect.left == winpos->cx) && (window_rect.bottom - window_rect.top == winpos->cy)) winpos->flags |= SWP_NOSIZE; /* Already the right size */ - if ((window_rect.left == winpos->x) && (window_rect.top == winpos->y)) + pt.x = winpos->x; + pt.y = winpos->y; + ClientToScreen( parent, &pt ); + if ((window_rect.left == pt.x) && (window_rect.top == pt.y)) winpos->flags |= SWP_NOMOVE; /* Already the right position */ if ((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)

1 0

Andrew Eikum : dsound: Validate and correct wValidBitsPerSample in primary buffer SetFormat.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 552433cf9e195109bbd520bf4eea47ad9afa6d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=552433cf9e195109bbd520bf4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 2 09:41:06 2012 -0500 dsound: Validate and correct wValidBitsPerSample in primary buffer SetFormat. --- dlls/dsound/primary.c | 28 +++++++++++++++++++++++++++- dlls/dsound/tests/dsound.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 5c74353..4851ac2 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -353,7 +353,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe HRESULT err = DSERR_BUFFERLOST; int i; WAVEFORMATEX *old_fmt; - WAVEFORMATEXTENSIBLE *fmtex; + WAVEFORMATEXTENSIBLE *fmtex, *passed_fmtex = (WAVEFORMATEXTENSIBLE*)passed_fmt; BOOL forced = (device->priolevel == DSSCL_WRITEPRIMARY); TRACE("(%p,%p)\n", device, passed_fmt); @@ -380,6 +380,11 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe passed_fmt->nBlockAlign != passed_fmt->nChannels * passed_fmt->wBitsPerSample / 8) return DSERR_INVALIDPARAM; + if(passed_fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(passed_fmtex->Samples.wValidBitsPerSample > passed_fmtex->Format.wBitsPerSample) + return DSERR_INVALIDPARAM; + } + /* **** */ RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); @@ -394,6 +399,13 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe goto done; } + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(fmtex->Samples.wValidBitsPerSample == 0){ + TRACE("Correcting 0 valid bits per sample\n"); + fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; + } + } + DSOUND_PrimaryClose(device); err = DSOUND_ReopenDevice(device, FALSE); @@ -427,6 +439,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 32; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -434,6 +448,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 16; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -441,6 +457,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 8; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -449,6 +467,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = passed_fmt->wBitsPerSample; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -456,6 +476,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 32; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -463,6 +485,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 16; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -470,6 +494,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 8; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 45dd00a..c68a5de 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1253,6 +1253,7 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) if (rc==DS_OK && primary!=NULL) { WAVEFORMATEX wfx; + WAVEFORMATEXTENSIBLE fmtex; wfx.wFormatTag = WAVE_FORMAT_PCM; wfx.nChannels = 0; @@ -1351,6 +1352,45 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) rc = IDirectSoundBuffer_SetFormat(primary, &wfx); ok(rc == S_OK, "SetFormat: %08x\n", rc); + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 2; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 16; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = 0; + fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); + ok(rc == S_OK, "SetFormat: %08x\n", rc); + + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 2; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 24; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = 20; + fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); + ok(rc == S_OK, "SetFormat: %08x\n", rc); + + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 2; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 24; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = 32; + fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + IDirectSoundBuffer_Release(primary); }

1 0